tree ce15ca23a9fdf16802cbae2c8aaf36a66db1aaae
parent 6824d81a004771dd8120b92ba51f5331d840bfb3
parent 9b675adc029697cdb7e43f4386c89f452de3a689
parent 49babcbd1d1f6ffe96faebbc4ee8cc059aa572e3
author The Android Open Source Project <initial-contribution@android.com> 1315596565 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1315596565 -0700

Reconcile with gingerbread-release gingerbread-mr4-release

Change-Id: I0f44d27ec2e8b99f45ee059d78cae7cceb41931e