| commit | 18ef17550599e67b6f3efa90c09b54d1e2b828a6 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Aug 13 21:30:45 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 21:30:45 2021 +0000 |
| tree | 072a590eededba01c8dbf420192b3b69d6aca608 | |
| parent | 7a8447fabae2d48f993c62136a19867da9907a69 [diff] | |
| parent | 32ca6e8190d0a3cc8d86d3f05a9e5d0dca143279 [diff] |
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 62d46ebc11 -s ours am: 32ca6e8190 -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: Iad6455fd5dd670a39daf41440fc690fb211fba69