| commit | 15126b820ef140e357aa1ea629c41c4920fa1c31 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Aug 13 21:20:26 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 21:20:26 2021 +0000 |
| tree | c5076890467ebef578004e59e5cd080647029e33 | |
| parent | 72c0ffd964ea97780ef0a8592ce85e3b8b6e16df [diff] | |
| parent | 78e68f78c78c2c45876a868b2ff250d2f1ad418f [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 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: I1f181076793b70d259de62617de0276a73cb1170