tree f477ef3d3c51e2787122eb91ae43a0883cad255a
parent 12ec2e6d71bc69ca11946f7f051931863c934273
parent ad06883730b4cd4af98c0c3ec69a7e851f9cace9
author Wink Saville <wink@google.com> 1389209462 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389209462 -0800

am ad068837: am 76d5cdd8: Merge "telephony: Add same named operator configuration for some operators"

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