OSDN Git Service

am 2caba1f7: am f15b0908: Merge "fix javadocs" into jb-mr1-dev
authorDirk Dougherty <ddougherty@google.com>
Tue, 5 Mar 2013 21:02:55 +0000 (13:02 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 5 Mar 2013 21:02:55 +0000 (13:02 -0800)
* commit '2caba1f763faf0656e2f27a9a422ada5908488c2':


Trivial merge