| commit | d40615e24ec0532a04ac76f45f2061f61a0e7ba1 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Apr 29 13:39:14 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Apr 29 13:39:14 2016 +0000 |
| tree | 4955985b2e44d4c5de484189611b95c9d0f10103 | |
| parent | 5a1fe20b16c0e7030b03c47136cccd9d62b1b966 [diff] | |
| parent | 9b49b7f8b2c3066ad2eed82ceb80f80f0c117c89 [diff] |
Merge "Disable the IpManager timeout on Ethernet. am: 0587321554 am: 8bb0952a05" into nyc-mr1-dev-plus-aosp