tree b2c22d8e37868d509cdf2b7dfecca6085b85071f
parent 4adcfb3b01c1d2b6cafeffb5613896ab9308fcfd
parent 365522a828f529593aa87e4d5a22f0cf2460c45a
parent 4186c31d183b8ffc747f0727f9a8c88d0047f903
author The Android Open Source Project <initial-contribution@android.com> 1312508762 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1312508762 -0700

Reconcile with gingerbread-release gingerbread-mr4-release

Change-Id: I4ef90a9d38940c8484c030056157a99a103f6aa9