am 6065c73e: am 1a2fd69a: am ce75fef7: Merge "Fix the build" into jb-mr1-dev
am 6065c73e: am 1a2fd69a: am ce75fef7: Merge "Fix the build" into jb-mr1-dev

* commit '6065c73e9f31b3a33c5bb72f4b989038b57efb2d':
  Fix the 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