tree e3fe56f3a9a380af64cd06de2c2cab32a08165a0
parent 8839391976c0c1224c47dd45fb885a207e33c53c
parent 68f20737839e9b183c9f0916b58cd4245f4dbec8
author jsh <jsh@google.com> 1285703217 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285703217 -0700

am 37a3631e: Merge "Add line break between PLMN and SPN in windowshade." into gingerbread

Merge commit '37a3631edfb1b848daca23bf5a12e1ab4bb6e096' into gingerbread-plus-aosp

* commit '37a3631edfb1b848daca23bf5a12e1ab4bb6e096':
  Add line break between PLMN and SPN in windowshade.