OSDN Git Service

am 3d9ccb0f: am 2c55f738: Merge "Don\'t show SIM lock Setting if carrier config hides...
authorJunda Liu <junda@google.com>
Thu, 18 Jun 2015 15:49:13 +0000 (15:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 18 Jun 2015 15:49:13 +0000 (15:49 +0000)
commit5410a1769821c016f869493c638f18a8f2a79bf0
treeb5f86230b9a27e2328324277ab28099a0663350e
parent1c8a483cb662da6b6aa685558e0058bebdc13251
parent3d9ccb0ff45a981a784a8807410c8a8bc1842cf2
am 3d9ccb0f: am 2c55f738: Merge "Don\'t show SIM lock Setting if carrier config hides it." into mnc-dev

* commit '3d9ccb0ff45a981a784a8807410c8a8bc1842cf2':
  Don't show SIM lock Setting if carrier config hides it.