| commit | a841e9ba73885cce2b52a596b2fe42fecae939e3 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Aug 13 20:51:42 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 20:51:42 2021 +0000 |
| tree | df116aad0f478bed5cf40824494d49e43b5b7735 | |
| parent | 2cfeeda7966cd94c896f7a844729f60211c16fa8 [diff] | |
| parent | d970a9ad7e40acd774d074d9425919eebbcaf4ea [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: I4e344aae0efb943414ee16aa5d054d3c7232c723