am 307d9cfc: Merge from AOSP

Browse Source

* commit '307d9cfc1690ec4982152aae1b6bd24ff8e078ed':

...

This commit is contained in:

Jean-Baptiste Queru 2012-04-24 18:50:18 -07:00 committed by Android Git Automerger

parent b579811b01 307d9cfc16

commit a9aa02cc4c

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