tree b3b742de0f323456eae9770041912996046bb2a6
parent 3c2c2ec800aa7c77401431351580d31a9316ae27
parent c97ea27f86e339a43da314755d6350657960abe9
author The Android Open Source Project <initial-contribution@android.com> 1249059332 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1249059332 -0700

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