refs/heads/android12-dev - platform/packages/apps/SettingsIntelligence

commit: 309fb4b1e6d2fa3cf976420da14e82f590347ed3
[log]
author: Xin Li <delphij@google.com>
Thu Mar 04 00:12:14 2021 +0000
committer: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Thu Mar 04 00:12:14 2021 +0000
tree: 95cf443f54ffd146ee5821792c331662ff06c22c
parent: 590bb5c0b93111ac68765bd9b17073d6d6e0691f [diff]
parent: 7e1dad283ac19830dfa2a72c7522a19943ca5333 [diff]

[automerger skipped] Merge RQ2A.210305.007 am: e420518160 -s ours am: da138ba9f6 -s ours am: 7e1dad283a -s ours

am skip reason: Change-Id I01a2369e2d88a8ac1b6879653f57c7c27e84cfbc with SHA-1 0cdf233f70 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/1613683

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6eaecb972bcf79fcdeb7abf542c82aa70cdcdef3

tree: 95cf443f54ffd146ee5821792c331662ff06c22c

proto/
res/
src/
Android.bp
AndroidManifest.xml
CleanSpec.mk
NOTICE
OWNERS
proguard.cfg