| commit | e1645d0c0c7afb6eb3f715e31298d2623bcad46e | [log] [tgz] |
|---|---|---|
| author | JW Wang <wangchun@google.com> | Mon May 17 05:40:59 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 17 05:40:59 2021 +0000 |
| tree | 6e2a47aa6640a6e3f8117afdb0839e7741fc0753 | |
| parent | 82cf83d490978bc95ebae3a1c8d74a9e64d79f79 [diff] | |
| parent | 3208605ab6c3d9ab40b3ca75fce334ea5a699dbc [diff] |
[automerger skipped] Merge "Backport of ag/14170751 and ag/14170752." into rvc-qpr-dev am: 3208605ab6 -s ours am skip reason: Merged-In I3c2b718905d2d7619d6f299ee5402fd858de030e with SHA-1 80005cd697 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14540386 Change-Id: I90f447370f6a4b208efdd0c73c59bd8ecd3e5da3