tree 0849d465fe09e0aef69492405e3528db08499822
parent f90518a71a0ef5c780db90e8dfb30fa21dd80874
parent a853d2b914144dd1f2ff3f03170f67d74338815d
author The Android Open Source Project <initial-contribution@android.com> 1305925581 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1305925581 -0700

Reconcile with gingerbread-release

Change-Id: Ibdf7e62e8fd0d3c6991767adb55d96c5e1bd4e97