| commit | 87492b889d2d90512c1e7129e3e5d04339d9e0e2 | [log] [tgz] |
|---|---|---|
| author | Clay Murphy <claym@google.com> | Tue Aug 11 21:12:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 11 21:12:33 2015 +0000 |
| tree | 7db6f5bf8095dc15964aab2250b50a7475f7d75d | |
| parent | 112f4c07c7de4bdb28aeb150233b24e7b1463f86 [diff] | |
| parent | 86e510cc313a464870ff82a9cd7f7206ea4aeb63 [diff] |
am 86e510cc: 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 '86e510cc313a464870ff82a9cd7f7206ea4aeb63': Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11d6f9e94c90197e7f8adf430c949c86) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20