tree f7b0cf4e4142633a81a1fcaf3c53ec56f53c209a
parent 1503b4257ac0139475263a0426a634317702b31d
parent db7ab295c4d6e9b03ea3149ad015699f63221087
author The Android Open Source Project <initial-contribution@android.com> 1251732960 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1251732960 -0700

Merge commit 'remotes/goog/eclair' into eclair-release