am d35186ce: (-s ours) am 7747795a: Merge "These are not javadoc tags, they...

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

Merge commit 'd35186ce1882b79db5aeaea7a5a6fdf4be89bcb8'

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