| commit | 396f7c103c3e5a430e297cec778049214c315aec | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:33:17 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:33:17 2020 +0000 |
| tree | 9af613ed56544eb6fea58d4c21ba88b9781fc422 | |
| parent | 4a1a948a084aa66368ffe8f14aaa30e09c8eeab4 [diff] | |
| parent | 78f78aa77ae7f5f468129e763c9becd574fa1760 [diff] |
[automerger skipped] Merge "Merge Android R" am: 92767c5101 -s ours am: 83266c89bb -s ours am: 78f78aa77a -s ours am skip reason: Change-Id I6915eba4e24ab91402540f89abbfc871b96e5d16 with SHA-1 e0de71ef07 is in history Original change: https://android-review.googlesource.com/c/platform/development/+/1422289 Change-Id: Iff57f28147294613b8bf92038ecdab61df39a0bc