Merge "Disable the IpManager timeout on Ethernet. am: 0587321554 am: 8bb0952a05" into nyc-mr1-dev-plus-aosp
am: d40615e24e

* commit 'd40615e24ec0532a04ac76f45f2061f61a0e7ba1':

Change-Id: Ib7fbcd926f1a128d86e7710e7e1f7f800afa695a
tree: 4955985b2e44d4c5de484189611b95c9d0f10103
  1. service-t/
  2. Android.mk