| commit | 8a25a5e93c937150e363a1d8116c00695fe2534a | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Aug 13 21:03:09 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 21:03:09 2021 +0000 |
| tree | f9ac849149b67c3a82bb1b881f6af42f7fe7fd4f | |
| parent | 6721fc968e8da0248a2771e9aaa96261595fc1c1 [diff] | |
| parent | 62d46ebc116352834db9798531b7c6ad6692dea5 [diff] |
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 62d46ebc11 -s ours am skip reason: Merged-In I2a2d02a0d7e67ee9577857a210cb6157683e5598 with SHA-1 52846cd871 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15550161 Change-Id: Ifa744e0b375e20194f82c0573e859575a15cf25b