| commit | 5f54e69b5a6dcb73350d1e616b3411b3699d048d | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Nov 18 22:37:55 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 18 22:37:55 2021 +0000 |
| tree | 4603a6c68488c3c166fb52f8a7f77cea164bf348 | |
| parent | ca9f1fa634a44eda3096847cbdf8c6c671c6c5ba [diff] | |
| parent | 83ec69c52b5194a91452238528e2f94729706135 [diff] |
[automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: 8fb8921a5d -s ours am: ab49adb1e8 -s ours am: 83ec69c52b -s ours am skip reason: Merged-In I13199bc39e9445929195f3d15579cbffe94e92b0 with SHA-1 0f473ac71a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16280702 Change-Id: Ieea0d6d46746b6c899bc8d1c5dcc91192973457b