am d0254da4: (-s ours) do not merge: cherrypicked 7bb05334b3 from master branch

Browse Source

Merge commit 'd0254da4e033df3265d9cea9bcbd8b6817e1d625'

* commit 'd0254da4e033df3265d9cea9bcbd8b6817e1d625':
  do not merge: cherrypicked 7bb05334b3 from master branch

...

This commit is contained in:

Fred Quintana 2009-08-16 17:21:48 -07:00 committed by Android Git Automerger

parent 9126f14875 d0254da4e0

commit 27c942450d

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