| commit | 6afe536fbc56ed4f40b59ce1f49d197e20135175 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Aug 13 21:20:29 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 21:20:29 2021 +0000 |
| tree | 60954ec4dafff972f3cf94a0783f265c15ac572e | |
| parent | 64485165813e7e3ca1ca056ddf44fc33e8144228 [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: I7bc8d9f2cac71fe07581ad25f922ca1de024c3c9