am 6b2c7600: am e47033f9: am 4d9aa17a: am 87db373a: am 2328a779: am 9eb66b2d: Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev
am 6b2c7600: am e47033f9: am 4d9aa17a: am 87db373a: am 2328a779: am 9eb66b2d: Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev

# Via Android Git Automerger (5) and Android (Google) Code Review (2)
* commit '6b2c7600e946b4130585f8665f9720d09feb6411':
  Revert "makefile changes for gcm javadocs"

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base