am 2ad6067c: (-s ours) do not merge: cherry-picked 44db990d3a from master branch

Browse Source

Merge commit '2ad6067ce491446ab22f59a363d36575a942f5c7' into gingerbread

* commit '2ad6067ce491446ab22f59a363d36575a942f5c7':
  do not merge: cherry-picked 44db990d3a from master branch

...

This commit is contained in:

Nick Kralevich 2010-08-30 14:29:13 -07:00 committed by Android Git Automerger

parent 44db990d3a 2ad6067ce4

commit 81ff156bea

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