| commit | f7db9d97754ad5224e973723e5d7e653ebf5ed60 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Jun 17 20:52:38 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 17 20:52:38 2022 +0000 |
| tree | cf88be90b668eaffc45bc4289233e9b10b9b0bcd | |
| parent | e90fac4550bcbcfbc2cbfe01478cd85fc10b420c [diff] | |
| parent | 80ad01c3b1adb5ec14e38878ea8e7956e485d897 [diff] |
[automerger skipped] Merge Android 12 QPR 3 am: 97aaa7fa51 -s ours am: a9dbc49ee3 -s ours am: 7769e9f141 -s ours am: 80ad01c3b1 -s ours am skip reason: Merged-In Id06010e4a12be1139ac8883c782e882265dce7cd with SHA-1 d5a68b4702 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2126138 Change-Id: I2a65c171a83523942fe6a46dafbbcc1a710141ac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>