| commit | 636e9c03e49652855372af7b34cac91bb0ad9075 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Nov 05 05:55:54 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 05 05:55:54 2021 +0000 |
| tree | 4b332108e8353e4c228c74a696e5a8413b5b3261 | |
| parent | 3e9d86d9e7d1199ff4956a4e96c70f2cd3ba57cb [diff] | |
| parent | 9589585fd5c780fc268942296a720bcff1f049db [diff] |
[automerger skipped] Merge "Resolve merge conflicts of c2810b93854d213736e6139dba757c2918ab9672 to sc-qpr1-dev-plus-aosp" into sc-qpr1-dev-plus-aosp am: 9589585fd5 -s ours am skip reason: Merged-In Ibdff22eda7be6c91e2872e5ac3ae8f2fe1e65b69 with SHA-1 069c6b50fc is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16193456 Change-Id: I2c47fae45cd5eb108c2f43b892253fb2ab43cefd