| commit | da579c3a77a203ce16e08a5d402ec8aea1804eba | [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 | e2dbf0dec4ed001a280cf867051940a8756d3afc [diff] | |
| parent | aed46dc0c38f8dc945262c49030541cccc80162c [diff] |
Merge "Disable the IpManager timeout on Ethernet. am: f485d9add1 am: 164ad1ce3b" into nyc-mr1-dev-plus-aosp