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

Change-Id: I20456e4268e1ef0fd7341bc99100366d2bd5e4ea


Trivial merge