8da586776dc62e9d3d2695868cf0ef1af90cb08e
417970a8ca
-s ours am: 19c298d5a9
-s ours am: 9c190ed43b
-s ours am: a76c571b37
-s ours am: c6f6a03d5f
-s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29911394
Change-Id: I3c5e965a3b3e8757c6ae43a952973617da4ec61f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merge "Removing upstream flag as it is now the default. Also moving to internal robolectric projects to no longer use the _upstream suffix." into main am:
7aa0ef4049
am: e96beeeb46
Description
No description provided
Languages
Java
89.8%
Kotlin
10.2%