Merge "Fix overriding ip configurtion with default one" into pi-dev am: 6f017e3319
am: 34c892c1d1

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