summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-10-23 07:32:35 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-10-23 07:32:35 -0700
commit1cf0d5422a20269cfad30401222bed3bae78ab7f (patch)
tree2ceaf70da2b52f87ba7b13923c19d3bdbfc7f244
parent397e3deb94cb59795c7a8e9119efd329c7ec3e9c (diff)
parenta565f7f6d38704251636e6fdc0fe096a467f9630 (diff)
downloadNetworkPermissionConfig-1cf0d5422a20269cfad30401222bed3bae78ab7f.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: a565f7f6d3 -s ours am skip reason: change_id If08aa2717e8ed0a7454a495434e11251f1fb877d with SHA1 8daa88c204 is in history Change-Id: I95bacdb6c5dde47b42a7f4a42ab40b79cf1436fc
0 files changed, 0 insertions, 0 deletions