| commit | 197953dbbcffdbe672d32152b3bf9b2ad1f50a98 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Aug 14 00:27:11 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Aug 14 00:27:11 2021 +0000 |
| tree | f1351e3f577fb6a52a43aa829144eb07700ea0dc | |
| parent | ea8c96559d1f094b724a712cdeec4aa3c0fb7840 [diff] | |
| parent | 31f16c5d71f4594cbd46ce33a95deb3b579415a1 [diff] |
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 62d46ebc11 -s ours am: 32ca6e8190 -s ours am: 6afe536fbc -s ours am: 31f16c5d71 -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: Ica3a9993f51c83c63b7969c3aeea8e8298e94516