| commit | ff808cd6e9ced0253c41dbc330905e0c2f02a56a | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Aug 13 23:32:29 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 23:32:29 2021 +0000 |
| tree | a9c80041bfedd7cdc2af27eb603e00c49c9348e0 | |
| parent | 77308c6101584e46d8faf71bbfe46b93f9c8f878 [diff] | |
| parent | 15126b820ef140e357aa1ea629c41c4920fa1c31 [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 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: If9c7f81ef295b0ac3d0f51e28aec95fbdd2e70be