am f82ab455: (-s ours) am de784d91: (-s ours) Cherrypick 3bfbbe2 from master. do not merge.

Browse Source

* commit 'f82ab455aaf208403e836b14eaf480133f5345d8':
  Cherrypick 3bfbbe2 from master. do not merge.

...

This commit is contained in:

Wink Saville

2011-09-29 17:04:49 -07:00

committed by Android Git Automerger

parent 6f812b2acb f82ab455aa

commit 5a221c15bc

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