am 38f75b97: (-s ours) am 58300000: This was already deprecated, but not picked up by the tool DO NOT MERGE

Browse Source

Merge commit '38f75b97d92508633c69eb6461efd353a61dab96'

* commit '38f75b97d92508633c69eb6461efd353a61dab96':
  This was already deprecated, but not picked up by the tool DO NOT MERGE

...

This commit is contained in:

Joe Onorato 2010-09-10 15:06:40 -07:00 committed by Android Git Automerger

parent d1bfd5a29e 38a9779ada

commit 5158363a25

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