tree 6df497ac2d3f020acf52fa0fb4cd2ed9731f5b11
parent 1ef5b78a2ffc471e5ac2e30b424f00d15d581a8c
parent 0e0a4628f6af7dc5f39d745098143699257dfbe6
author Mark Salyzyn <salyzyn@google.com> 1454449099 +0000
committer android-build-merger <android-build-merger@google.com> 1454449099 +0000

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

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