commit | 4c2a7142ffc350756a21547622326abb1c6bde68 | [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 | a7b9e2fdb5ece3a1ed51ca45c14b470432978b42 [diff] | |
parent | d40615e24ec0532a04ac76f45f2061f61a0e7ba1 [diff] |
Merge "Disable the IpManager timeout on Ethernet. am: 0587321554 am: 8bb0952a05" into nyc-mr1-dev-plus-aosp am: d40615e24e * commit 'd40615e24ec0532a04ac76f45f2061f61a0e7ba1': Change-Id: Ib7fbcd926f1a128d86e7710e7e1f7f800afa695a