| commit | 14c4c374ce6739f2b5719b7982db6199d5b9b769 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Nov 18 22:25:14 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 18 22:25:14 2021 +0000 |
| tree | b6a2305e53c59166809a47755dd56888aa7621e4 | |
| parent | 73487347ed2f3b41cc44d8acef68e297e28bfcbc [diff] | |
| parent | e98e3aa6540a38ae4bfaa10af6cebea3576570c3 [diff] |
[automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: 810f916326 -s ours am: e98e3aa654 -s ours am skip reason: Merged-In I129ee68719302e29045bb2aa13093c2864f305af with SHA-1 65c943e4e9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16279020 Change-Id: I5ddb70aa0dc21b21c281774fee8966177fb27d58