tree 2b0b7c963c60bc6356d2d1ba6b5c22ec3aa0792a
parent bf986d8deeeed9566e0badeba89d4800533cbca6
parent 1526004ae564f492a5394532e1bca38e821d073e
parent 1526004ae564f492a5394532e1bca38e821d073e
author The Android Open Source Project <initial-contribution@android.com> 1312508782 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1312508782 -0700

Reconcile with gingerbread-release gingerbread-mr4-release

Change-Id: I8e15abd3f33eecd285c108257dd4d89ee6b1423f