| commit | 86e510cc313a464870ff82a9cd7f7206ea4aeb63 | [log] [tgz] |
|---|---|---|
| author | Clay Murphy <claym@google.com> | Tue Aug 11 21:04:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 11 21:04:24 2015 +0000 |
| tree | 7475cc94e06191207be259f2daf4a34f9906f1ef | |
| parent | 0150dae61563c44dfb12a6d367a4f4f72253fcc4 [diff] | |
| parent | 71a33c4d5b010757423980b90681445ca2bb2be0 [diff] |
am 71a33c4d: Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11d6f9e94c90197e7f8adf430c949c86) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev * commit '71a33c4d5b010757423980b90681445ca2bb2be0': Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11d6f9e94c90197e7f8adf430c949c86) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20