tree 573cc940580f8e2a21dd94c799367c07980eeaab
parent f201ae83fc1742f34f9b0ff248c0c6c48a55f7a4
parent e8f79c1f5de7ecaf1249ee36813abd2558cacf08
author The Android Open Source Project <initial-contribution@android.com> 1277142763 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1277142763 -0700

merge from froyo-plus-aosp

Change-Id: I64de22c97a98ec4f1f288c619e3d66d6be261c6d