Merge "Correct watchdog timeout am: bfef9c5748 am: 0d526131b9" into oc-mr1-dev-plus-aosp

am: bc89d3eab2

Change-Id: I4ffdf7a866d128a2e452cdda2b32a6d7771d8cc4
This commit is contained in:
Jeff Tinker
2017-07-21 22:17:32 +00:00
committed by android-build-merger

Diff Content Not Available