tree 857f55220606f16c0932484c2c2ea573b2d6694d
parent db974ee7bdb28bbdf733b6d9f94b2f5edcd4de26
parent 7acf0f37266de5b29a8f14d48d7170cef30cdabf
author The Android Open Source Project <initial-contribution@android.com> 1275954213 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1275954213 -0700

merge from froyo-plus-aosp

Change-Id: I2143b0ab6c94047d36d83a734985e9dfa67efda3