tree 62ae95e5606b65456e4877a437dfcb3020b7cee1
parent c15791f7c799fc073fb84eb9a3e69dd97a6c932a
parent cec0a8e6a4ae126589d09af6143c95ef301f73dd
author Daniel Sandler <dsandler@android.com> 1327087870 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1327087870 -0800

am 4d3161f3: Merge "Always show appropriate mobile service label." into ics-mr1

* commit '4d3161f379195302b720e120c5e6b65a0adfaf8c':
  Always show appropriate mobile service label.