am b0994ed7: (-s ours) CherryPick 35530d from master to mr0. do not merge.

Browse Source

* commit 'b0994ed7ffd31d02b9d66a470decfdfaf0d6f8ee':
  CherryPick 35530d from master to mr0. do not merge.

...

This commit is contained in:

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

parent d58d3c281b 724e6d05eb

commit e33558752f

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