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

Browse Source

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

...

This commit is contained in:

Jean-Baptiste Queru

2011-01-14 21:30:16 -08:00

committed by Android Git Automerger

parent e76ca5e0f1 9286cfe501

commit 89a11e5d5c

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