commit | 5e230aef5efaa3b2e9682e47c6c79a7c7f0f92a0 | [log] [tgz] |
---|---|---|
author | Sarah Chin <sarahchin@google.com> | Wed Apr 06 08:37:25 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 06 08:37:25 2022 +0000 |
tree | 9b6505ba39e771870776320ed49c2e2eb5050430 | |
parent | 8160b254cb5d60640aa93b48962001623e99b4d5 [diff] | |
parent | cab7c559ec6bcf43708f50e673e19912da527d9c [diff] |
[automerger skipped] Merge changes from topics "deactivate_no_tds", "deactivate_no_tds_revert" am: 82bb853ff6 am: 8fb0b7d82f am: cab7c559ec -s ours am skip reason: Merged-In I43bcb551bbb8775ed489822ca3ad3fe3af7e9c0b with SHA-1 271e0b6d0a is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2057051 Change-Id: I77ae9427ebcd8fc02de095dd41740701db921250 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>