OSDN Git Service

Merge "Fix javadoc which broke build." into gingerbread
authorNick Pelly <npelly@google.com>
Wed, 19 Jan 2011 01:07:56 +0000 (17:07 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 19 Jan 2011 01:07:56 +0000 (17:07 -0800)

Trivial merge