[automerger skipped] String change to highlight calculation stopped at last even hour am: 205d8249a7
-s ours am: 27c242f01d
-s ours
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696
Change-Id: I3a39b7fcfbfce0c7b909e16a1275842bcafa5b4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: