OSDN Git Service

am 5410a176: am 3d9ccb0f: am 2c55f738: Merge "Don\'t show SIM lock Setting if carrier...
authorJunda Liu <junda@google.com>
Thu, 18 Jun 2015 16:11:58 +0000 (16:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 18 Jun 2015 16:11:58 +0000 (16:11 +0000)
commit9eeb63f50113fb23cfc3e56ff5777e8819c92c8f
treebe5a3a45ef6b5da8ab4df3b9e8f758f5d6d3e084
parent0095930e12839ed596bc9569ddaf44074ef0afb4
parent5410a1769821c016f869493c638f18a8f2a79bf0
am 5410a176: am 3d9ccb0f: am 2c55f738: Merge "Don\'t show SIM lock Setting if carrier config hides it." into mnc-dev

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