tree f3a9d2b48fd07f69e79c1736b75443e51de5f03d
parent 8ca43a0008a10ddd3915bfdc12f63440dc2a6a22
parent 1dcf32e403f3c7afe06d878e3a26e15d38d05a5b
parent 4797d4667b26ee7d77d3fb626c26b688830e17ee
author The Android Open Source Project <initial-contribution@android.com> 1316010163 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1316010163 -0700

Reconcile with gingerbread-release gingerbread-mr4-release

Change-Id: I7652fcb5face6c9940511e8d3aa0e3fa86432442