commit | f170953343ebb89e8128e8ddb4e98f20bafad8eb | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jun 19 07:01:40 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 19 07:01:40 2020 +0000 |
tree | 17a1472abfcb915fbb6db29362819f628d15b338 | |
parent | 74698ef2a09a68b19a46005866d075f6e1f5f51e [diff] | |
parent | b207e9c9dee5e5ab9adc347d3780937b9fe86f32 [diff] |
[automerger skipped] Merge changes I2292c1cb,I8f60c137 into rvc-dev am: aee09af636 -s ours am: b207e9c9de -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: Ic7bd992bf5438db376c7bea15ff9821b7fdb5fcd