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)

Trivial merge