am fd324486: am 5cb05eea: Merge "Fix build." into honeycomb-mr2
am fd324486: am 5cb05eea: Merge "Fix build." into honeycomb-mr2

* commit 'fd3244868dec40707039cd616dd37ada41774547':
  Fix build.

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