tree 1d7094debf54112bdc2ea73810b189c8c90083a8
parent e1fef62bce230b9eb8a2a2c910d593f87e8173be
parent ca553e21f8a82a421a2ea1ff504e7f9e328edb23
author The Android Open Source Project <initial-contribution@android.com> 1277143003 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1277143003 -0700

merge from froyo-plus-aosp

Change-Id: I85cd0e3207b09b81e41f15d85cd1c900a6bb56b3