am d35186ce: (-s ours) am 7747795a: Merge "These are not javadoc tags, they are annotations in sample code. Escape them properly." into gingerbread

Browse Source

Merge commit 'd35186ce1882b79db5aeaea7a5a6fdf4be89bcb8'

* commit 'd35186ce1882b79db5aeaea7a5a6fdf4be89bcb8':
  These are not javadoc tags, they are annotations in sample code. Escape them properly.

...

This commit is contained in:

Joe Onorato 2010-09-16 10:56:14 -07:00 committed by Android Git Automerger

parent 0e309d0b05 d2ca897f68

commit 93d6c5e399

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