Merge "Disable the IpManager timeout on Ethernet. am: c84dd94998 am: 8060ae0aee" into nyc-mr1-dev-plus-aosp
tree: 10e71c54b6c0a6625254d943885352fb7fd04e23
  1. Android.mk
  2. java/