tree 2d6207493c9530d6b83c819f5488fcd4ed8f808e
parent 0af90f6f750300e54409c251682e86d90401d0ab
parent 841ef3bd2081a74bf95be83211e92a653df61541
author Narayan Kamath <narayan@google.com> 1386795742 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386795742 +0000

am 841ef3bd: am bcf1454c: Merge "Use FileMap from libcutil instead of rolling our own."

* commit '841ef3bd2081a74bf95be83211e92a653df61541':
  Use FileMap from libcutil instead of rolling our own.