am f1da34a8: am ec9ccc17: Merge "Fix current.txt build break" into lmp-dev
am f1da34a8: am ec9ccc17: Merge "Fix current.txt build break" into lmp-dev

* commit 'f1da34a8242724a330939cd93957db4ae58e467c':
  Fix current.txt build break

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