tree 927ebf35bdbdbd73009a876c90b4757471e64604
parent 82e25bd59deedb4c17514e1e724b8baca5ea7f14
parent e9b4b3e94d396d176338c62f8c9f4c183b340f9b
author Scott Main <smain@google.com> 1340652835 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340652835 -0700

am e9b4b3e9: Merge "docs: clean up javadoc code snippets, unescaped entities" into jb-dev

* commit 'e9b4b3e94d396d176338c62f8c9f4c183b340f9b':
  docs: clean up javadoc code snippets, unescaped entities