commit | 4d7616e57a77ce3a22419908fb27f4f9d9a01f5e | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jun 19 07:01:51 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 19 07:01:51 2020 +0000 |
tree | 17a1472abfcb915fbb6db29362819f628d15b338 | |
parent | d51b56d0b933d106db1b23c9ffc40ed8ac4e755c [diff] | |
parent | d8a97e64b5cb820fc6b8bae8ff90616beade4afb [diff] |
[automerger skipped] Merge changes I2292c1cb,I8f60c137 into rvc-dev am: aee09af636 am: d8a97e64b5 -s ours am skip reason: Change-Id I2292c1cbff06a304f70191b88d833b19af2b8b92 with SHA-1 00ea6cecd8 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907887 Change-Id: Ibeaba2f4a62238043400321882147ecd0aa3b85c