tree 12ff94f44352c731e14e20b7848c02800545a8cd
parent b66a5c0574e14b838d9dc2497540ffc6cb73dc4f
parent 36b332beca58f4bc350d820fe0a3a7bb13899028
author The Android Open Source Project <initial-contribution@android.com> 1279059847 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1279059847 -0700

merge from open-source froyo

Change-Id: I2759c464efef13754154310d10816a5781243311