am a8e09520: am 96100195: Fix the build.
am a8e09520: am 96100195: Fix the build.

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