am 2d3df559: Merge "Fix sim build (sim doesn\'t have strl*() reliably...)" into froyo
am 2d3df559: Merge "Fix sim build (sim doesn\'t have strl*() reliably...)" into froyo

Merge commit '2d3df559dea9ebb0ab263c2df26e8a345ed74d12' into froyo-plus-aosp

* commit '2d3df559dea9ebb0ab263c2df26e8a345ed74d12':
  Fix sim build (sim doesn't have strl*() reliably...)

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base