| commit | 01e118fc8a3daa85b4e16e4ccc5e0f9e06f70aa8 | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Wed May 19 12:57:00 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 19 12:57:00 2021 +0000 |
| tree | f689c0d07e020b46eb8554ddb7edb0d64a03d42d | |
| parent | 22423db017e3e506a98bbbbd65635b875f9fdc77 [diff] | |
| parent | d8d50e6c8fa0da8eb8534bb1657c6573b84fb76c [diff] |
[automerger skipped] Merge changes I3ba50cbd,I970ee365 into sc-dev am: b987babf5e -s ours am skip reason: Merged-In I3ba50cbd8a7f60779c69ba85e10dc3cc8a52f8b1 with SHA-1 a081acd610 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14562500 Change-Id: Ic87d5b62ddd55ec1c264839dd84c3c375794e428