tree c3a04b2613c2d6aa87ad4ed3aab7d2d7e7e04543
parent 3ce952536ba9a4c14cfb7cf30cb13a9e8a2b0e5a
parent 5b4ba9b9107e869c6bf5cf733370ff31e21ffacb
author Zoltan Szatmary-Ban <szatmz@google.com> 1443271007 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443271007 +0000

am 5b4ba9b9: am 63c12871: am 8c8fff44: am 0a91b05f: Merge "Don\'t use deprecated getNetworkInfo(networkType)" into mnc-dev

* commit '5b4ba9b9107e869c6bf5cf733370ff31e21ffacb':
  Don't use deprecated getNetworkInfo(networkType)