am bb8d6fb4: Merge "Fix build warning"
am bb8d6fb4: Merge "Fix build warning"

* commit 'bb8d6fb4fc272ee2eb69b69e5149f81c95b79818':
  Fix build warning

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