am 54e2e86c: (-s ours) do not merge: cherry-picked 60151a295ccf726238dc47456d80b427db6d6a38 from master branch

Browse Source

Merge commit '54e2e86c5740a2c7a02e95e94c4aff362a5502cf'

* commit '54e2e86c5740a2c7a02e95e94c4aff362a5502cf':
  do not merge: cherry-picked 60151a295ccf726238dc47456d80b427db6d6a38 from master branch

...

This commit is contained in:

Doug Zongker 2009-08-17 14:11:31 -07:00 committed by Android Git Automerger

parent 60151a295c 54e2e86c57

commit 50a8a71f0b

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