am 60247737: Merge "Fix build - re-generate current.txt"
am 60247737: Merge "Fix build - re-generate current.txt"

* commit '60247737a7fa7f8e412b7047db4b5d33fe1d62a1':
  Fix build - re-generate current.txt

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