commit | c346dab88100ec0b8c3e6b8177f7ed8fd97e5edc | [log] [tgz] |
---|---|---|
author | Joe Bolinger <jbolinger@google.com> | Wed Sep 01 22:23:23 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 01 22:23:23 2021 +0000 |
tree | 6dbd5d074fdb228178fce5f275d96a56700c4137 | |
parent | a77a337eda05c4b7ad8396456ff895607e057257 [diff] | |
parent | 16a7d2e7bd3431624afabbc1432d77f064e323e7 [diff] |
Merge changes from topic "more-cancel-sc-qpr1-dev" into sc-qpr1-dev am: 16a7d2e7bd Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15727904 Change-Id: Id8fb1fac31177116d974bd99f1056f6565d986ea