tree 2a8e236d566c8b506d7278a98f7ad1c0bdcc5091
parent 976c414fb98e72124934740aa6adbfbaa126c14f
parent 8a04ed4c46e3e339cf94592c72dc49ab866bee6b
author Christopher Tate <ctate@google.com> 1503102303 +0000
committer android-build-merger <android-build-merger@google.com> 1503102303 +0000

Merge "Improve alarm in-flight diagnostics" into oc-mr1-dev am: 39a7fe7939
am: 8a04ed4c46

Change-Id: Ic267302dad04c428557168552d9b0299a9186cfa