OSDN Git Service

am 35764d6f: am ef789fa1: am bb9eda64: am 2ff97d99: am d194c6ac: Merge "Fix Documenta...
authorJeff Arneson <jarneson@google.com>
Tue, 6 Jan 2015 02:27:21 +0000 (02:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Jan 2015 02:27:21 +0000 (02:27 +0000)
commit579be0670507ca380d361ffdbc2cff7f53e9d0cd
tree9c64cbc6d0e3dbbae926e33b80548cddd92c6b8f
parente019e8206ab3eb96641eeae8bfc6dfadc804d710
parent35764d6f99761ed63d2d762be4bddf0a3a1e5e0a
am 35764d6f: am ef789fa1: am bb9eda64: am 2ff97d99: am d194c6ac: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs

* commit '35764d6f99761ed63d2d762be4bddf0a3a1e5e0a':
  Fix Documentation typo when showAnnotations is used with doclava