tree 9921674b951810322a7f8be869d29b88f0edf175
parent 37c9c4e4256d519d0967b7239d6fa46dffac6f43
parent 94846fea8b88b76955982112cb4d0e3ce6672e51
author Amit Mahajan <amitmahajan@google.com> 1439253766 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439253766 +0000

am 94846fea: Preferred network type should be shown as global for cdma devices.

* commit '94846fea8b88b76955982112cb4d0e3ce6672e51':
  Preferred network type should be shown as global for cdma devices.