commit | 97e3ededd2882684f289c6cd56b8f7844d26a467 | [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 | 9c4eb3522baabe6b58a303c6833144a6feba3c84 | |
parent | 83c47f06add9c0b931ae173a81d1dcff6c7368e7 [diff] | |
parent | f4e7d32a7a43993595b46a902bed21efd289c784 [diff] |
[automerger skipped] Merge changes I2292c1cb,I8f60c137 into rvc-dev am: 1115ecda57 am: f4e7d32a7a -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: Ibeaba2f4a62238043400321882147ecd0aa3b85c