commit | bdfbee8eab537c94d8e8f1a26b5a42ca870f8d60 | [log] [tgz] |
---|---|---|
author | Matt Pietal <mpietal@google.com> | Thu Dec 09 14:47:47 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 09 14:47:47 2021 +0000 |
tree | b45a18abc20bec8ba3e73eef3222444a6a29b2ad | |
parent | 66e0795666a5188f5fe3c4a40ed0966feb6b41b3 [diff] | |
parent | d5a32602dd0c1426b3b8745252225c289370175a [diff] |
[automerger skipped] Merge "[DO NOT MERGE] Controls - Do not recreate intent" into rvc-dev am: 2cc3ce9885 am: 920d225e72 -s ours am: 151e1ff45e -s ours am: 9c6fc1d31d -s ours am: d5a32602dd -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16012418 Change-Id: I714fd2f80b7c98f53532c3d737a1f1ed856ca060