tree 40ed1231f5ef73b73ea2015807683e4e76004b11
parent dd565d0717b06ba2c7e5d4dbe410f1ef0f64c362
parent da138ba9f6399077a978dcacc369f1341c73e7b9
author Xin Li <delphij@google.com> 1614814635 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614814635 +0000

[automerger skipped] Merge RQ2A.210305.007 am: e420518160 -s ours am: da138ba9f6 -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: Ie6cc616a6887d58590055968e6f03f4cf4a22978