tree b35b9f715c89020e8f585c40c05313a43d7cc83d
parent a880c2d8ee4fa2ef9e90b094aacd3b7a6445c7fb
parent bb55e4463464668fa9b1c671d4d5d2d25e7c48e3
author Xin Li <delphij@google.com> 1599011990 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599011990 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 58f3de5330 -s ours am: 26aa485b1e -s ours am: 4c2000e5db -s ours am: bb55e44634 -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: Ifb0890c7bb1cecd1fff0e51b3e429723945c6332