| commit | 07e50b9dae73256294dd9cbeaf51c482515ad226 | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Wed May 19 13:18:43 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 19 13:18:43 2021 +0000 |
| tree | 6ec84bf6ac75f6865c5a5765f31998b02fbe852a | |
| parent | 691dbb4c65d658063a8c8d526c7b986484c533b9 [diff] | |
| parent | 3ce2e480cac1130493dfa474e97085126869ef67 [diff] |
[automerger skipped] Merge changes I3ba50cbd,I970ee365 into sc-dev am: 458a60dab5 -s ours am: 3ce2e480ca -s ours am skip reason: Merged-In I3ba50cbd8a7f60779c69ba85e10dc3cc8a52f8b1 with SHA-1 0f57022302 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14562500 Change-Id: I5ab7a94fc84840d4feaf2d558167332b7af946dd