| commit | 6553dbd90e265a849c7ac343115c390ec071e848 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Aug 18 00:23:43 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 18 00:23:43 2021 +0000 |
| tree | 6d4785c7747d02b9a8b991922eef3ff300c40f95 | |
| parent | a85519f1af1f32a97e10c7f4a32e07f41e90e1fe [diff] | |
| parent | d10bd881cab8897b9217665528f2107e935091d0 [diff] |
[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 3010764a8a -s ours am: 059bc47a0b -s ours am: f79c362008 -s ours am: d10bd881ca -s ours am skip reason: Merged-In Icec03f01321c64d95d0bf1487ee9a1f4ae10529f with SHA-1 3aebb8c20e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15571798 Change-Id: I1e81a991c749ea86315aa68bf534eee540462747