tree d08c7d4d9555ba49ed4fc9f4bdca494dbe539eb5
parent d5c90316593f6d8aeef132137cb1956c8c03ea70
parent 5b26cd31ee89b17da8c9b25af099d67f961a098c
author Junda Liu <junda@google.com> 1434414285 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434414285 +0000

am 5b26cd31: am b7f9e8a4: am 73d04323: Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." into mnc-dev

* commit '5b26cd31ee89b17da8c9b25af099d67f961a098c':
  Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager.