| commit | 78e68f78c78c2c45876a868b2ff250d2f1ad418f | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Aug 13 20:53:29 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 20:53:29 2021 +0000 |
| tree | d6d501e0fc61a6480dad51d1c82f7d68d32422d4 | |
| parent | 362b31f106aa8c8e005a2a761f7b640f77f52f1f [diff] | |
| parent | 30a1c99c1b936511de1eb5edd5420bed44e94662 [diff] |
[automerger skipped] Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev am: 30a1c99c1b -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: I4d5de89e4b12987a615c7c534c6b5740ec7eb1db