am c1761e7f: Fixed build after merge
am c1761e7f: Fixed build after merge

* commit 'c1761e7fe10390d90b805f373b51ecaabf214dac':
  Fixed build after merge

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