| commit | b76fe154f470f4e7ed8d59fb5285045598c5394d | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Fri Apr 29 13:41:32 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Apr 29 13:41:32 2016 +0000 |
| tree | 4955985b2e44d4c5de484189611b95c9d0f10103 | |
| parent | 66eacd2c3dd58acfb9c751a715c74f328546a083 [diff] | |
| parent | da579c3a77a203ce16e08a5d402ec8aea1804eba [diff] |
Merge "Disable the IpManager timeout on Ethernet. am: f485d9add1 am: 164ad1ce3b" into nyc-mr1-dev-plus-aosp am: da579c3a77 * commit 'da579c3a77a203ce16e08a5d402ec8aea1804eba': Change-Id: Ib7fbcd926f1a128d86e7710e7e1f7f800afa695a