| commit | 1a2c24c33ace5e65be04ebc7f4e6802b106bb520 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Aug 14 00:27:09 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Aug 14 00:27:09 2021 +0000 |
| tree | 5c54694134dabf138e66b69a4426212a54caf52d | |
| parent | aa071b8a7b649b7ba7e7542cd4e80cb803d3e7ea [diff] | |
| parent | ff808cd6e9ced0253c41dbc330905e0c2f02a56a [diff] |
[automerger skipped] Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev am: 30a1c99c1b -s ours am: 78e68f78c7 -s ours am: 15126b820e -s ours am: ff808cd6e9 -s ours am skip reason: Merged-In I35aae96e4ebb0c13bc567bb926f2e7a549f554ba with SHA-1 6c582e973d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15547733 Change-Id: Ie8bc18991cfc9191b10c21a4be8b104f38d41ac7