tree ddceac0300d4737abecc48797414312c85c6d629
parent fce442c23e65fa1973947df683eec9a5c36057a5
parent 15c950ba38b8f41d1c4301e5a42286385d1dde45
author The Android Open Source Project <initial-contribution@android.com> 1308175789 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1308175789 -0700

Reconcile with gingerbread-release

Change-Id: I500f9a10cdfb891919b1e5618a42330ba00fcfb6