OSDN Git Service

am 7d7ab5ae: am 24f32b32: Merge change I89c40f50 into eclair
authorFred Quintana <fredq@google.com>
Mon, 5 Oct 2009 21:35:27 +0000 (14:35 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Oct 2009 21:35:27 +0000 (14:35 -0700)
commit4df43ae4a793ac81d95c0b50967d444ca2d28ffa
treea1d7c7aa742d4a1e9519818da849712611cec31b
parent36cad7be504608a538c845b4a44f0dcee157a338
parent7d7ab5ae21dcabc5d0a3a5798d1d0e8c1b057d23
am 7d7ab5ae: am 24f32b32: Merge change I89c40f50 into eclair

Merge commit '7d7ab5ae21dcabc5d0a3a5798d1d0e8c1b057d23' into eclair-mr2-plus-aosp

* commit '7d7ab5ae21dcabc5d0a3a5798d1d0e8c1b057d23':
  fix a javadoc build breakage