tree af3918b9314ff41e0cfb4ab9d979aea90de8aa8d
parent 04141f48fc175b6046fe6f959e5475f83016daf6
parent 3b84a48a676d81a4696141b4480b40b59be00b14
author The Android Open Source Project <initial-contribution@android.com> 1315838811 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1315838811 -0700

Reconcile with gingerbread-release

Change-Id: I4b6c483135fc0cb50e6de6c2fde845842c29e25c