summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-09-05 12:57:59 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-05 12:57:59 -0700
commitc32e25fdb2b87dcaf4e6507b25382d72ae87552c (patch)
tree53c36ced8fa3e3ee3d6995dc6072a226815ea23d
parent029e606f8c10ba016f88985b0d4da36e95faf44e (diff)
parent18f02edec8a3ba2df76a86d3e1d3704e4c290956 (diff)
downloadchips-c32e25fdb2b87dcaf4e6507b25382d72ae87552c.tar.gz
[automerger skipped] DO NOT MERGE - Merge Android 10 into master
am: 18f02edec8 -s ours am skip reason: subject contains skip directive Change-Id: I149993b7321040c90f0ab4d59de754683b62ef5c
0 files changed, 0 insertions, 0 deletions