am 800ca40d: am 9f208824: Merge change I7f97011b into eclair-mr2
am 800ca40d: am 9f208824: Merge change I7f97011b into eclair-mr2

Merge commit '800ca40dfa296a90ec2dd2ae526b39181a809bc5'

* commit '800ca40dfa296a90ec2dd2ae526b39181a809bc5':
  check for native initialization before calling public function

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