am 251de854: am 53e9bfae: Merge "Fix error checking in MemoryFile."
am 251de854: am 53e9bfae: Merge "Fix error checking in MemoryFile."

* commit '251de854f02a22ae613964de7ec96f2e0816e503':
  Fix error checking in MemoryFile.

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