| commit | f6171a743ac9746631e67aff11aa73205beb4d69 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Aug 13 21:30:42 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 21:30:42 2021 +0000 |
| tree | df116aad0f478bed5cf40824494d49e43b5b7735 | |
| parent | 3b14a821567a75be3cb6fe23f45c3b0c1aa48a30 [diff] | |
| parent | 0c4bbd7b0124784bf998260bbbca6b67bf57d7f3 [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: I6162e93e7f80a6662e9a953883a2e02372c26009