summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Su <dysu@google.com>2019-11-04 19:15:21 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-11-04 19:15:21 -0800
commitb8cc7742c35dc786b6c75a8c0bce552e2e37f3a7 (patch)
treeac44fe210e4573d0407a6317a6f543b1ba3d602b
parent44d49045ef94144431ffb915f2ca04d520c21827 (diff)
parentcea6925a48959ec2a386db6605ac67c96ca50057 (diff)
[automerger skipped] Accept either MAINLINE_NETWORK_STACK or NETWORK_STACK permission. am: ccffa4a350 am: 38c73d1403
am: cea6925a48 -s ours am skip reason: change_id I0c431e27ea6f5d46ebf9e32c283040889bd48056 with SHA1 1836e90933 is in history Change-Id: I20f2cc72fa8acce6db50b6acd1e6e44bdc239722
0 files changed, 0 insertions, 0 deletions