am 83fdc69e: (-s ours) Merge "Squash commits of the following patches, cherry-picked from other branch - do not merge." into gingerbread

Browse Source

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

...

This commit is contained in:

James Dong 2011-01-27 08:12:36 -08:00 committed by Android Git Automerger

parent 6c556df3d0 b1f1d0ede6

commit 0093da6b1e

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