summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-10-23 07:20:34 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-10-23 07:20:34 -0700
commita565f7f6d38704251636e6fdc0fe096a467f9630 (patch)
tree25262c115ee53a0576886637b8acbe386033a1c6
parent57ff71e4fc18a8ef9957cd361a2db556e4a2bb17 (diff)
parent38827a39cc3e897bdb086bb3f2ade507323fb9b5 (diff)
downloadNetworkPermissionConfig-a565f7f6d38704251636e6fdc0fe096a467f9630.tar.gz
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: f4dcbaeb43 -s ours am: 1c7a074323 -s ours
am: 38827a39cc -s ours am skip reason: change_id If08aa2717e8ed0a7454a495434e11251f1fb877d with SHA1 8daa88c204 is in history Change-Id: Ibf6cec1ade21178e41917f6a93d1bfea9942beef
0 files changed, 0 insertions, 0 deletions