Merge "Fix overriding ip configurtion with default one" into pi-dev
am: ca37085a07

Change-Id: I82933a83a7d13903bbce9a85d6e8dae1a492bf24
tree: 7d8fba327c516746ce54f551a54077f016febe41
  1. service-t/
  2. Android.mk