OSDN Git Service

am 5f8524d4: am 36af7943: Fix malformed Javadoc.
authorBrad Fitzpatrick <bradfitz@android.com>
Wed, 8 Dec 2010 21:30:25 +0000 (13:30 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Dec 2010 21:30:25 +0000 (13:30 -0800)
* commit '5f8524d446fb217516eebafe5d347005051891d1':
  Fix malformed Javadoc.


Trivial merge