tree 2c7656afb4c2dff7dcb5e7856127c0d073171bf0
parent 1dd77487abf8b0de37f0554f0fe5d54553afd87b
parent 5d7cd375e853aca670d01d92308f178145e0d0e8
author Narayan Kamath <narayan@google.com> 1386796194 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386796194 +0000

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

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