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

Change-Id: Ib175faaa4c72f7118bbb34e1921d3cbf780ad5da


Trivial merge