summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-10-23 07:25:40 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-10-23 07:25:40 -0700
commit397e3deb94cb59795c7a8e9119efd329c7ec3e9c (patch)
tree2ceaf70da2b52f87ba7b13923c19d3bdbfc7f244
parent2f561ba1ba7b308f38ceb0314d700f9ff5b49fc6 (diff)
parent57ff71e4fc18a8ef9957cd361a2db556e4a2bb17 (diff)
downloadNetworkPermissionConfig-397e3deb94cb59795c7a8e9119efd329c7ec3e9c.tar.gz
[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 8daa88c204 -s ours am: 021fd3babe am: e597406558 am: 81bb23d852
am: 57ff71e4fc -s ours am skip reason: subject contains skip directive Change-Id: Ifce0c605a8245af0ae1d0a0770cf04c15224d462
0 files changed, 0 insertions, 0 deletions