am 11f5fe94: am b9386ed9: Merge change Ic9e65818 into eclair-mr2
am 11f5fe94: am b9386ed9: Merge change Ic9e65818 into eclair-mr2

Merge commit '11f5fe94a03405ccc644bfc0870bbb740ed39145'

* commit '11f5fe94a03405ccc644bfc0870bbb740ed39145':
  Attempt to fix the build server build: make the common library

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