Merge "Log which watchdog timer was exceeded" am: 9bd0272d00 am: 00bbea1771 am: a20ae...
authorKalle Raita <kraita@google.com>
Fri, 28 Apr 2017 23:42:04 +0000 (23:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 28 Apr 2017 23:42:04 +0000 (23:42 +0000)
am: 49c18c6c67

Change-Id: I050f989e6f725a1d8500f680725f27fab13e9002


Trivial merge