am 155cf6c1: (-s ours) am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread

Browse Source

* commit '155cf6c1e191bb03fe24db8663715862d8e6a43d':
  CherryPick 988eeeb5 from hc-mr1. do not merge.

...

This commit is contained in:

Xavier Ducrohet 2011-06-28 18:56:17 -07:00 committed by Android Git Automerger

parent 80543fa0e9 691580c6bf

commit 81877d0fda

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