am 7ba4b482: Merge "Fix build" into jb-mr1-dev
am 7ba4b482: Merge "Fix build" into jb-mr1-dev

* commit '7ba4b4823dd6d8166d60970f9c1f530d43f943b4':
  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