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

Change-Id: I7a5bc8bb11c700deffebef11b6d0152c76ff1365


Trivial merge