tree f3a9d2b48fd07f69e79c1736b75443e51de5f03d
parent 4554be939650dfffb52eda333fac44800e74abac
parent 8dfe7824380448cca8a09596768cc14d4d7db02d
author The Android Open Source Project <initial-contribution@android.com> 1315838807 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1315838807 -0700

Reconcile with gingerbread-release

Change-Id: Idd382400f3db9808e7d3d532e67f84be11c493ab