| commit | 9442985210d2f1249728e53adafe3937afec6800 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jun 19 06:51:23 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 19 06:51:23 2020 +0000 |
| tree | 87f2dee386bc778a6ff870693e70556024bf4bfe | |
| parent | ea1eabac24c0ef5a1d21384f16e80d35fd15f80c [diff] | |
| parent | 1115ecda5741ca712fb3d7a93473d501bdd4fe64 [diff] |
[automerger skipped] Merge changes I2292c1cb,I8f60c137 into rvc-dev am: 1115ecda57 -s ours am skip reason: Change-Id I2292c1cbff06a304f70191b88d833b19af2b8b92 with SHA-1 26aab1467f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907887 Change-Id: I6cd21960502b97f81d6a8027b51ec77d6928f3a9