| commit | 32ca6e8190d0a3cc8d86d3f05a9e5d0dca143279 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Aug 13 20:53:32 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 20:53:32 2021 +0000 |
| tree | 6bf3a24ee3408a214854a8e1eca7072355ac0096 | |
| parent | a8c7c54eed57e5a4b56905a4fb00e27e25b1b908 [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: I5af46ba65d1c26d1218b68068ef5710a6056e672