commit 1c9ee299530f61a19989fc0d0bc2829684d95eaa
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 29 19:21:16 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 29 19:21:16 2022 +0000
tree caf1c659e67576ca29172b225fc2c6c8eba7e782
parent 9e8060f2813569d136189e995123c348a29bc95f
parent 55ac4c997c3f91d549503d7a98f19074c2c49446

Merge "[automerger skipped] Merge "Merge "Merge "[conflict] Merge "Allow list intents for tips app from smartspace content provider Ref bug: b/238841916" into android10-tests-dev am: 2af749a976" into android11-tests-dev am: 9b35efb4ce" into android12-tests-dev am: 6d42d1569a" into android12L-tests-dev am: 5789802c0d -s ours" am: 55ac4c997c

Original change: https://android-review.googlesource.com/c/platform/cts/+/2165086

Change-Id: I772b562bf6917108141588e1d3a5780c8808b335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>