| commit | 94ff847722c6be0bc51f7afd2bc816cd155600a3 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Aug 16 15:13:56 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 16 15:13:56 2021 +0000 |
| tree | f1351e3f577fb6a52a43aa829144eb07700ea0dc | |
| parent | 9cf612f12d429fc23ed9e68d3a7fa9fe823d79da [diff] | |
| parent | 8a25a5e93c937150e363a1d8116c00695fe2534a [diff] |
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 62d46ebc11 -s ours am: 8a25a5e93c -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: Ib94cfbfd4d8abcbf1d8aca04ff7fc39ab3827a2f