tree 40ed1231f5ef73b73ea2015807683e4e76004b11
parent 4ced4b4b1fbfcf8170fa207a468e3c01b143a81a
parent 0cdf233f701bcd061181906f27b17a3a1641831e
author Xin Li <delphij@google.com> 1614071119 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614071119 +0000

[automerger skipped] Merge ab/7061308 into stage. am: 0cdf233f70 -s ours

am skip reason: Change-Id I7f2edcffeeda6e7e805214c95c08c4fa57a7c50c with SHA-1 f075352694 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5df14103e6c7cc847120b9d4605b4316d96ea676