tree 9018a349f90ddc35bc0b70e33376f6be47e66ac2
parent 270abd69448a1cae78649127aa43750b4067192f
parent 7fb0ff53e87115d98af7272368348bbc270516ae
author Mark Salyzyn <salyzyn@google.com> 1397776948 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397776948 +0000

am 7fb0ff53: am 25f07f77: Merge changes I487ebe67,Ie7a0aeb2

* commit '7fb0ff53e87115d98af7272368348bbc270516ae':
  libutils: FileMap styling adjustments
  libutils: FileMap 64 bit compile issues