commit | 78f78aa77ae7f5f468129e763c9becd574fa1760 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 02:02:27 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 02:02:27 2020 +0000 |
tree | 9af613ed56544eb6fea58d4c21ba88b9781fc422 | |
parent | 61d776b42a8b64b9ca93bed941b7b6f0b119c7dc [diff] | |
parent | 83266c89bbd4c2434ae157a96beaead57c3bb4fc [diff] |
[automerger skipped] Merge "Merge Android R" am: 92767c5101 -s ours am: 83266c89bb -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: I4fa7631984efd9e0512848ade52811701435147d