Merge "Introduce small clock on the settings screen" into udc-dev am: 4a3d7406f7 am: 07682a65c6 am: 3e7de069dc am: 8eabe51493
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23375956 Change-Id: I7d3cb5bff961a1ffa327280d517841a57fe7f467 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: