am 16d520fc: Merge "Rename ZipEntryName to ZipString"
am 16d520fc: Merge "Rename ZipEntryName to ZipString"

* commit '16d520fce6a3cecdc6b50e184a00b9585b86e512':
  Rename ZipEntryName to ZipString

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