tree ed4a83303188535a4bd080f718ceddf8a433bb5f
parent 1cc19a7049e14898425e9f1cd53153d268094706
parent ee3bb7c351e732e8f518cde0238bf9b3d810d80a
author The Android Open Source Project <initial-contribution@android.com> 1305921710 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1305921710 -0700

Reconcile with gingerbread-release

Change-Id: I18a6000c9f2d2537e2447035a0f389aee6d52f1a