Merge "Fix overriding ip configurtion with default one" into pi-dev
tree: a4636c88be1c98afa11b74991cb57772fdbb07bf
  1. java/
  2. Android.mk