Merge "Log which watchdog timer was exceeded" am: 9bd0272d00 am: 00bbea1771 am: a20ae...
authorKalle Raita <kraita@google.com>
Thu, 24 Aug 2017 17:33:56 +0000 (17:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 17:33:56 +0000 (17:33 +0000)
am: 49c18c6c67

Change-Id: I4b760e5f168ef847b88b886e3ea074ddd7398640


Trivial merge