tree 4bb2d788e40fe5a36b74d8680f8aa1bc4b8a18e6
parent fc092653856579437da9807aea2567e90a2ffb09
parent bac8ae4d1de90e4d01f3782465a02e1ef989e030
author Narayan Kamath <narayan@google.com> 1386795997 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386795997 +0000

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

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