tree 1663e541aa06e3a99cb74fdc317d64fef91b614d
parent 2e6f14dbd8c5d2a702da4735e4e348720de9c204
parent 56b135b91051664ae9027f50e9f20b7fcf6565ba
author Daniel Sandler <dsandler@android.com> 1339530340 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339530340 -0700

am 56b135b9: Merge "Put PLMN and SPN on one line in the notification panel." into jb-dev

* commit '56b135b91051664ae9027f50e9f20b7fcf6565ba':
  Put PLMN and SPN on one line in the notification panel.