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

* commit '9b4d3cb3a47bcad973165fdd888306b3c80c66b0':
  Fix a bug that would end up in memory corruption
main
The Android Open Source Project 2011-11-16 07:45:53 -08:00 committed by Android Git Automerger
commit b21a1f4158

Diff Content Not Available