am 043c5f8f: Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1

Browse Source

* commit '043c5f8f1d9a8e9077e1c16af28509b30f00324d':
  Cherry-picking Id45abeba and Ia065dec6 for MR1

...

This commit is contained in:

Justin Ho 2011-12-16 11:54:01 -08:00 committed by Android Git Automerger

parent 678a2adf1a fe7a2124ae

commit 65cd774f30

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available