OSDN Git Service

am 32f7d50d: am 21d0a173: Fix build - javadoc.
authorNick Pelly <npelly@google.com>
Sat, 29 Jan 2011 16:02:04 +0000 (08:02 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 29 Jan 2011 16:02:04 +0000 (08:02 -0800)
* commit '32f7d50df147e4eb171044aad376bd1425fcf5e7':
  Fix build - javadoc.


Trivial merge