aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-09-11 21:27:10 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-11 21:27:10 +0000
commita890a57d880e9feafc993c39ab22fef770c7cbdc (patch)
treedc14d3d116fe072cbfd245e73567c9d2eaf42384
parentea90e08ad55de85e12e978651521a5ee4ea39ee2 (diff)
parent48f1fed84889c910411c0c987237c633bdaffbe9 (diff)
downloadandroid-a890a57d880e9feafc993c39ab22fef770c7cbdc.tar.gz
[automerger skipped] Merge "Merge Android R" am: ddb9444be0 -s ours am: 46d255c5ee -s ours am: 79e6f36845 -s ours am: c1c1d6bf6c -s ours am: 48f1fed848 -s ours
am skip reason: Change-Id I3eacc623ecb0e0c2fb65633d5d6ab9df811c61dd with SHA-1 3f8d030a1f is in history Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1422288 Change-Id: Ida40da640ec072962780e7dc1c732227b4f12314
0 files changed, 0 insertions, 0 deletions