OSDN Git Service

am 6b2c7600: am e47033f9: am 4d9aa17a: am 87db373a: am 2328a779: am 9eb66b2d: Merge...
authorRobert Ly <robertly@google.com>
Tue, 12 Feb 2013 22:00:44 +0000 (14:00 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 12 Feb 2013 22:00:44 +0000 (14:00 -0800)
# Via Android Git Automerger (5) and Android (Google) Code Review (2)
* commit '6b2c7600e946b4130585f8665f9720d09feb6411':
  Revert "makefile changes for gcm javadocs"


Trivial merge