diff options
| author | Joe Onorato <joeo@google.com> | 2011-05-31 14:11:58 -0700 |
|---|---|---|
| committer | Joe Onorato <joeo@google.com> | 2011-05-31 14:11:58 -0700 |
| commit | 6a045ca18fc7d3d004400c438c7033562ce1da11 (patch) | |
| tree | e72264ae0cc6903932e80ef489a50782507e75ed /docs/html/sdk/api_diff/10 | |
| parent | 3a4b8bb6756120cfdef2faa7c1966963ef011faf (diff) | |
| parent | fce12613edc5c0550b73cd9af66fa9651fc0ea1e (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
Diffstat (limited to 'docs/html/sdk/api_diff/10')
0 files changed, 0 insertions, 0 deletions