OSDN Git Service

Merge "Fix Javadoc build break."
authorLeon Scroggins III <scroggo@google.com>
Wed, 15 Jan 2014 19:24:39 +0000 (19:24 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 15 Jan 2014 19:24:39 +0000 (19:24 +0000)

Trivial merge