OSDN Git Service

am a5fe776a: Merge "fix javadoc error which breaks SDK build in gingerbread" into...
authorVasu Nori <vnori@google.com>
Mon, 19 Jul 2010 22:29:10 +0000 (15:29 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Jul 2010 22:29:10 +0000 (15:29 -0700)
commit0c7f4e5e81506050acbe4ef4182e431ee4bf65cf
tree84f9ae1e55b173a9692d2868c7d1a956b7c47de9
parentf0c6f6437d7f0a9a8ad822547debf6ec848c8726
parent9f63ea27d5848e9bfb648d18331e50003bb84bcd
am a5fe776a: Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread

Merge commit 'a5fe776a7933b2241858ef83f01b812c7badc231' into gingerbread-plus-aosp

* commit 'a5fe776a7933b2241858ef83f01b812c7badc231':
  fix javadoc error which breaks SDK build in gingerbread