tree 36fab9a862f8f64d327c308229dcc9196f5ebda1
parent 8e425ada05228f28b0b16beabc3bc2339b53354c
parent 58f3de5330b672c79308f2e4733fb8439940d6c1
author Xin Li <delphij@google.com> 1598992652 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598992652 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 58f3de5330 -s ours

am skip reason: Change-Id I56ccb7002a0f00000936ba02c1926fb4929ae34b with SHA-1 f8dafc97e2 is in history

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

Change-Id: Ica9cd13410aaddd291c73c4f7a75fdc4b17f189a