am e869ca96: (-s ours) CherryPick f9e455 from master to mr0. do not merge.

Browse Source

* commit 'e869ca9626146265bbb2b5043018dfe532e0661f':
  CherryPick f9e455 from master to mr0. do not merge.

...

This commit is contained in:

Xavier Ducrohet 2011-10-24 13:32:30 -07:00 committed by Android Git Automerger

parent 32c1a95f18 c9c85fb2d2

commit f2ec33a777

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