am af83d4ec: (-s ours) am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge.

Browse Source

* commit 'af83d4ecff0ad1638a1a0f3a3f9805468ed710b4':
  Merge 2402ad60 from honeycomb-mr1. do not merge.

...

This commit is contained in:

Xavier Ducrohet 2011-05-29 08:59:57 -07:00 committed by Android Git Automerger

parent eac92714af ed0e037b04

commit dc35d6e366

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