tree 10e71c54b6c0a6625254d943885352fb7fd04e23
parent 9c095e1871432ded244a6ade462d82d2e1a8648e
parent 468f4d04abf32816069f63f0e81a923867ddfcee
author Android Build Merger (Role) <android-build-merger@google.com> 1461937154 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1461937154 +0000

Merge "Disable the IpManager timeout on Ethernet. am: c84dd94998 am: 8060ae0aee" into nyc-mr1-dev-plus-aosp