commit | aedb766c71ae950b7dff9b2dcaad168805cd4a59 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Sun Aug 15 04:19:38 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 15 04:19:38 2021 +0000 |
tree | a4df5873fe64528121f3c38431ceb23903e89677 | |
parent | f66029c9474e82b1e9d3ff71b0cbd8da4c9a85ca [diff] | |
parent | c0d8d881ca73191b53eb72712a718e5f74a23197 [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: c0d8d881ca -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: I75c460a7292a12daa45bcbd57c6cd4ab077b52ea