tree 3b81a10c945f810b59a9c099d862d00665bbfc04
parent d2deee1eeb4de93b2d5158dcfc79b1bb68accf79
parent 1524cad7f7f379f7df15638f0ae2bc08951b8ec1
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