commit | 92987a284d9e719e8c869b73d6aedf4d31a9e31b | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Sep 01 21:47:14 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 01 21:47:14 2020 +0000 |
tree | 827c59191f3400d95376eff28d2c46cfb6b50438 | |
parent | 858457f8c2861507d3359d77253651d4e4645f71 [diff] | |
parent | 54c0df13759b1b78094ce305b00a44c6858b2c6a [diff] |
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 9ac0f46277 -s ours am: 54c0df1375 -s ours am skip reason: Change-Id I154200abc92c71c6244479a5ad9c5e9e78d72b4e with SHA-1 8fc7f8c52d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ex/+/12470017 Change-Id: Ie7fa91fac308c776273091e05f46165add9976af