tree 0da5aafc6a06eeea7aa18680b23d0ef8140f21a1
parent 0ac3adb0380f0d2f048d0cef15995656bfdb9169
parent 697fb7622b402627e85081d2fbb84a8fc3daafbc
author The Android Open Source Project <initial-contribution@android.com> 1310077360 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1310077360 -0700

Reconcile with gingerbread-release

Change-Id: I1b4ebc93955e3e929c8984e4e6b505d628061b68