Merge "Fix some history issues" into tm-dev am: b28925ad48
am: 2c6c99e1f1
am: e646203486
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17710594 Change-Id: Ieeb14271cdb9ab8f64cc495fd7825bc3a7465c14 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: