tree 7a375165c96b754d82ba1b6c304084645a5197bf
parent bf601c7c40a31c3789a45128d217fab0ecc45115
parent 433b85aa347016d3110aa6e478bc35be0cc3ef88
parent 433b85aa347016d3110aa6e478bc35be0cc3ef88
author The Android Open Source Project <initial-contribution@android.com> 1312508757 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1312508757 -0700

Reconcile with gingerbread-release gingerbread-mr4-release

Change-Id: Ib4073e5060f6e9981a31ad5671a21bd930f403f4