| commit | d53f2fa6c52bcad2d5d505eecd22f3425d5d0812 | [log] [tgz] |
|---|---|---|
| author | Joe Onorato <joeo@google.com> | Tue May 31 14:11:58 2011 -0700 |
| committer | Joe Onorato <joeo@google.com> | Tue May 31 14:11:58 2011 -0700 |
| tree | c97b8969e4ef613eb50132c6fb67db73972f0892 | |
| parent | 39d48eaeb8e9f66d23398bec0e08d3fd2dda1a17 [diff] | |
| parent | 19217ac44f9e1251d830efa76da28e180c05e1fd [diff] |
Merge commit 'fce12613' into HEAD Conflicts: core/res/res/layout-sw600dp/status_bar_latest_event_content.xml core/res/res/layout-sw600dp/status_bar_latest_event_content_large_icon.xml core/res/res/layout-xlarge/status_bar_latest_event_content_large_icon.xml core/res/res/layout/status_bar_latest_event_content_large_icon.xml Change-Id: I9e7182df4035e625af6d50d70f37078ae33d6e5d