tree 24e16b17e457d890f2cb81b276e20ce0900b532c
parent f303a7fd774f97eca79bfa44eb7d25a394d0abf4
parent 2328a77980a8e4aa2dafac1b9a8e228877a7425c
author Robert Ly <robertly@google.com> 1360705912 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360705912 -0800

am 2328a779: am 9eb66b2d: Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev

# Via Android (Google) Code Review (2) and Android Git Automerger (1)
* commit '2328a77980a8e4aa2dafac1b9a8e228877a7425c':
  Revert "makefile changes for gcm javadocs"