tree 0da454e29d390d45b92f260b7a27158e5e6ded42
parent 5a7b1503b531596458f37b35f8f51fa3bb91c156
parent 8e77393ae9b5ff99be06798311b3ec4362fbcb40
author Dan Sandler <dsandler@android.com> 1385484517 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385484517 -0800

am 8e77393a: am 99ef026f: Merge "Keep PhoneStatusBar default constructor around."

* commit '8e77393ae9b5ff99be06798311b3ec4362fbcb40':
  Keep PhoneStatusBar default constructor around.