am 404780d6: Merge change 22132 into eclair
am 404780d6: Merge change 22132 into eclair

Merge commit '404780d62b8f6fe6787fca27cf36fe2c20b7220e'

* commit '404780d62b8f6fe6787fca27cf36fe2c20b7220e':
  build fix

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