am 4d2b9bf3: (-s ours) Cherrypick 6de7bc61 from master. do not merge.

Browse Source

* commit '4d2b9bf341e7978225d6a305c2524ff79f2d18c5':
  Cherrypick 6de7bc61 from master. do not merge.

...

This commit is contained in:

Xavier Ducrohet 2011-09-22 23:39:44 -07:00 committed by Android Git Automerger

parent 6eb7db4263 4d2b9bf341

commit 280cc66558

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