| commit | a890a57d880e9feafc993c39ab22fef770c7cbdc | [log] [tgz] |
|---|---|---|
| author | Xin Li <[email protected]> | Fri Sep 11 21:27:10 2020 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Fri Sep 11 21:27:10 2020 +0000 |
| tree | dc14d3d116fe072cbfd245e73567c9d2eaf42384 | |
| parent | ea90e08ad55de85e12e978651521a5ee4ea39ee2 [diff] | |
| parent | 48f1fed84889c910411c0c987237c633bdaffbe9 [diff] |
[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