tree 1effcc1663b586683588aab2071eb7b4202a101f
parent c91d5884056b4a13f7f990aebf62f6c698856fea
parent 37921cd911a238cee5d79c6f63f84304c1ca36e0
author The Android Open Source Project <initial-contribution@android.com> 1305921711 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1305921711 -0700

Reconcile with gingerbread-release

Change-Id: I04ace1c344bedc2525a6c1eb8abe78b2f42d08a6