am 3191f909: (-s ours) DO NOT MERGE Don\'t tear down based on NetworkFactory input.

* commit '3191f909a20216646f1652537eba6804b5435c74':
  DO NOT MERGE Don't tear down based on NetworkFactory input.
tree: 675ad860f0c89fcf6e5839d60188e66160e10b7f
  1. java/
  2. Android.mk