am 041fd74b: (-s ours) am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread

Browse Source

* commit '041fd74beade4e95cff6157af9dadbf9a99b7fcf':
  Merge 05b7b69c from honeycomb-mr1. do not merge.

...

This commit is contained in:

Xavier Ducrohet 2011-05-23 10:21:57 -07:00 committed by Android Git Automerger

parent 8d54f983ba 03f2861cae

commit a81e01a111

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