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)
commit71a33c4d5b010757423980b90681445ca2bb2be0
tree54587f9f310151437a4ca83559e160f97ab8dfac
parent073f74d90853b39de32308fa3eeab9aa8998bd69
parenta76428792fedb33d0a67ea52f0300677cee103a5
Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11d6f9e94c90197e7f8adf430c949c86) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev