diff options
author | Xin Li <delphij@google.com> | 2020-09-11 03:33:10 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-11 03:33:10 +0000 |
commit | c1c1d6bf6c9150479775025e652ebdd5acf26440 (patch) | |
tree | dc14d3d116fe072cbfd245e73567c9d2eaf42384 | |
parent | 52d9ebfd546142f0aff92d7044a024af53b73f36 (diff) | |
parent | 79e6f3684583b76ae9e6053e7568817dba3bdf42 (diff) | |
download | android-c1c1d6bf6c9150479775025e652ebdd5acf26440.tar.gz |
[automerger skipped] Merge "Merge Android R" am: ddb9444be0 -s ours am: 46d255c5ee -s ours am: 79e6f36845 -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: Ib73632928b186f77be7f9375ecd04dac50aca146
0 files changed, 0 insertions, 0 deletions