tree 7a3c295d9585f6114222a815637b2cc16d196fc7
parent 507d31b86b38dffe7c60ca5c54b5e631f5a7cab3
parent 1c55ddb75833b6bb6b7ebafd0fdf4f47596a4505
author The Android Open Source Project <initial-contribution@android.com> 1310077362 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1310077362 -0700

Reconcile with gingerbread-release

Change-Id: I3cb3d915837ebe59c2d7007d71ef3a1f334e9b8b