OSDN Git Service

am 0bfee5a4: Merge "fix javadocs b/14414251" into klp-modular-dev
authorRobert Ly <robertly@google.com>
Tue, 17 Jun 2014 19:26:48 +0000 (19:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 17 Jun 2014 19:26:48 +0000 (19:26 +0000)
* commit '0bfee5a4905a14a318731661214558792abc2f7d':
  fix javadocs b/14414251


Trivial merge