| commit | 79e6f3684583b76ae9e6053e7568817dba3bdf42 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 02:02:19 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 02:02:19 2020 +0000 |
| tree | dc14d3d116fe072cbfd245e73567c9d2eaf42384 | |
| parent | 63b859104382dfd57cb1cd95c252fb5e683a15de [diff] | |
| parent | 46d255c5ee899ead6330e7b73e5c85ff6afb7eac [diff] |
[automerger skipped] Merge "Merge Android R" am: ddb9444be0 -s ours am: 46d255c5ee -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: I6a8a83d84bad18f01deb1a35f8b7c482f0af9eb8