| commit | cf38a0c43fc0dfb292b67c80dd3ac94491963992 | [log] [tgz] |
|---|---|---|
| author | Rebecca Silberstein <silberst@google.com> | Wed Jun 29 21:15:37 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 29 21:15:37 2016 +0000 |
| tree | f18bb772ee39131c27c92ab89352b849c04326b9 | |
| parent | 7d02e24f062d542161ea8746d10b1fa6c62d2b3a [diff] | |
| parent | 2b5c3084ddde8c4f332a52c2c5eb29137ab183de [diff] |
Merge changes from topic \\'cherrypickWifiWatchdogResetOnTrigger\\' into nyc-mr1-dev am: 9a53ff620c am: 2b5c3084dd -s ours Change-Id: If3928efd19d48e4c437bad5f275eaa21c892446d