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 162dd490cd 041fd74bea

commit ea182704b6

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