tree 675ad860f0c89fcf6e5839d60188e66160e10b7f
parent ed75bcf13a0b416843cf8d8e349a3340ae270f9d
parent 3191f909a20216646f1652537eba6804b5435c74
author Robert Greenwalt <rgreenwalt@google.com> 1406051599 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1406051599 +0000

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.