tree 67cb2ad7cafdabfc4bcad52f398461f9acbcdd2f
parent a4b27873ae2b18bdddbeafaad98d2efec7f9eba9
parent 5814d9bf34cfbdc3266ce8ff6a9a590553983a64
author Nancy Chen <nancychen@google.com> 1418065989 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418065989 +0000

am 5814d9bf: am 4ec83c02: Merge "Use TelecomManager to call TelephonyManager#getVoicemailNumber (2/2)" into lmp-mr1-dev

* commit '5814d9bf34cfbdc3266ce8ff6a9a590553983a64':
  Use TelecomManager to call TelephonyManager#getVoicemailNumber (2/2)