tree ea5c86489a7ea805952b7cb9a147a89cc5642fea
parent cf100c9b85f9fd7043fcd3b5afd5de4d3fa51554
parent 2898a4ad5ede1fa3d42b4b2bd54a4b91b61bcc2b
author Mark Salyzyn <salyzyn@google.com> 1397777629 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397777629 +0000

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

* commit '2898a4ad5ede1fa3d42b4b2bd54a4b91b61bcc2b':
  libutils: FileMap styling adjustments
  libutils: FileMap 64 bit compile issues