| commit | 2b5c3084ddde8c4f332a52c2c5eb29137ab183de | [log] [tgz] |
|---|---|---|
| author | Rebecca Silberstein <silberst@google.com> | Wed Jun 29 20:32:27 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 29 20:32:27 2016 +0000 |
| tree | af03fd5b27a30864819b82b721ecd94a7fbca58f | |
| parent | 2fd7946753263783cc8bb03af0891e8a1368ce56 [diff] | |
| parent | 9a53ff620c9281be423227bc48378d9aad3f37e0 [diff] |
Merge changes from topic \'cherrypickWifiWatchdogResetOnTrigger\' into nyc-mr1-dev am: 9a53ff620c Change-Id: I2bc5dcf37f16a6036ece6d863b76fe5326978db2