am 89a11e5d: (-s ours) am 9286cfe5: (-s ours) merge 83fdc69e from gingerbread - do not merge

Browse Source

* commit '89a11e5d5c3210359679e6f211444e0d7240ae0a':
  Squash commits of the following patches, cherry-picked from other branch - do not merge.

...

This commit is contained in:

Jean-Baptiste Queru

2011-01-16 10:44:01 -08:00

committed by Android Git Automerger

parent ec647e2efa 89a11e5d5c

commit 5076ba0aa1

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

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

Diff Content Not Available