tree 71228ab81d0b80d74d1fc82245055e8114ad3f36
parent 400b6232090c9e620bf4eedd34c8ceadb00b2237
parent d6a263f46b9050ca0cb8f7743ce38f3ac9c7466d
author Vineeta Srivastava <vsrivastava@google.com> 1394243634 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394243634 +0000

am d6a263f4: am 230e20d2: am 5ef72c30: am f066adde: am dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev

* commit 'd6a263f46b9050ca0cb8f7743ce38f3ac9c7466d':
  telephony: Add same named operator configuration for some operators