am 25cbe892: Reconcile with ics-factoryrom-2-release

* commit '25cbe8924a7ec5c45914c8818b5ad7b39e1f6103':
  Fix a bug that would end up in memory corruption
main
The Android Open Source Project 2011-11-16 07:38:51 -08:00 committed by Android Git Automerger
commit cdd9c16e47

Diff Content Not Available