tree 9344e2e1ee723fdae80c2ce2ad94d82633afb6e4
parent df5e4d48a514b5703d4d75d814cf5fe39497f865
parent 1cbd67d91edfcedbfd28aac75c1c616ced66ab4a
author Elliott Hughes <enh@google.com> 1422464288 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422464288 +0000

am 1cbd67d9: am c7fe4b37: Merge "Fix @link annotation in documentation for hyperlink generation"

* commit '1cbd67d91edfcedbfd28aac75c1c616ced66ab4a':
  Fix @link annotation in documentation for hyperlink generation