am 4d9aa17a: am 87db373a: am 2328a779: am 9eb66b2d: Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev
# Via Android Git Automerger (3) and Android (Google) Code Review (2)
* commit '4d9aa17a':
Revert "makefile changes for gcm javadocs"