tree 6e953f5e903fafb1bf7248c353657faf11e24d50
parent 1ee7abd066e3e5161f3ec53ab9c0c9d7b1389ede
parent a9bb866861766305482757d90b9263dcd648b90e
author Mark Salyzyn <salyzyn@google.com> 1454449259 +0000
committer android-build-merger <android-build-merger@google.com> 1454449259 +0000

Merge "libcutils: ashmem fortify and comply with Android coding standard" am: 0e0a4628f6
am: a9bb866861

* commit 'a9bb866861766305482757d90b9263dcd648b90e':
  libcutils: ashmem fortify and comply with Android coding standard