am 2d95a33d: Merge "Fix build.  Missed current.txt in previous checkin." into jb-mr1-dev
am 2d95a33d: Merge "Fix build.  Missed current.txt in previous checkin." into jb-mr1-dev

* commit '2d95a33dc3a463b197d4597b38f5ae124de25017':
  Fix build.  Missed current.txt in previous checkin.

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