OSDN Git Service

Merge "Add the ability to display annotations in the generated docs (cherry-picked...
authorClay Murphy <claym@google.com>
Tue, 11 Aug 2015 20:55:24 +0000 (20:55 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 11 Aug 2015 20:55:24 +0000 (20:55 +0000)

Trivial merge