| commit | d392b28abec5fbe8fc1c0566e1f18985beeefba8 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Jun 17 19:57:29 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 17 19:57:29 2022 +0000 |
| tree | 3495973415e51d81fd3113af36d89533fbcce665 | |
| parent | 80ad01c3b1adb5ec14e38878ea8e7956e485d897 [diff] | |
| parent | 5dcd20e40669d131670b9cb105eff16c2ccc2fe6 [diff] |
[automerger skipped] Merge "Merge Android 12 QPR 3" am: 099a4648fd -s ours am: 53182e4f36 -s ours am: 5dcd20e406 -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: Ie3188486334bc0878a28e00915c528f81a4199f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>