OSDN Git Service

Merge "Work on issue #29042642: Watchdog going off" into nyc-dev
authorDianne Hackborn <hackbod@google.com>
Thu, 2 Jun 2016 18:31:15 +0000 (18:31 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 2 Jun 2016 18:31:16 +0000 (18:31 +0000)
commit5a6cf3ac9a3945c2d1f0e5e28ffda9e52124eb15
tree3fd40b64e0ad10a07b61ebe0c2410f08b8599373
parentc4f1bc40326c10fde55f07230e3fe3067d70fbfa
parent9b78db41a0f2230001535b3ca33a3ebc31e6c6c1
Merge "Work on issue #29042642: Watchdog going off" into nyc-dev