am 3a1eb8fc: (-s ours) Cherry-pick 7fb4cc from master. do not merge.

Browse Source

* commit '3a1eb8fc1c389585c18526b03cf6fa153fb9391f':
  Cherry-pick 7fb4cc from master. do not merge.

...

This commit is contained in:

Xavier Ducrohet

2011-09-22 23:39:47 -07:00

committed by Android Git Automerger

parent 8fbf284cc8 3a1eb8fc1c

commit 2080734362

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