tree 22391a3f034e40a1a27acb797411af01f4e0c662
parent 2a2ec87b55d423ae91385d4e9f51725154b7a272
author Daniel Sandler <dsandler@google.com> 1311971449 -0400
committer Daniel Sandler <dsandler@android.com> 1312255581 -0400

Merging ongoing + latest notifications on phone UI to match tablets.

Change-Id: Ie8ee72137e9eeb6740f3d113d5331e8cba629ab2