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)
commit49c18c6c6777786b449f0605452aa0a22409e62b
tree1f66dca15c98fcd24bbb9e12a156f110f95239b4
parent297d0b5cf16454f5c4e725bdb200d1ab0b96177e
parenta20ae3d6a89355c83293a9f2c5fcaf203df52980
Merge "Log which watchdog timer was exceeded" am: 9bd0272d00 am: 00bbea1771
am: a20ae3d6a8

Change-Id: I7a5bc8bb11c700deffebef11b6d0152c76ff1365