[automerger skipped] Merge "Add exception handling to ClockRegistry to prevent crashes" into tm-qpr-dev am: 341b5a877a am: 66e01a8537 -s ours
am skip reason: Merged-In I9db17a3d945b75846ac238b59634fb595a8c8706 with SHA-1 901c0a5dcb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19488390
Change-Id: I9d23e3532db805a0c14e17a1a03e9df7d6b2c3ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: