tree 83360ca0f1723dbf426972e36745daa6c51ad50c
parent cf401627fd76c145e1d1dc12f04975d29385a9f8
parent 3dd8d953ea1dcfb210fbc689fb931956f84b3dfe
author Elliott Hughes <enh@google.com> 1462399296 +0000
committer android-build-merger <android-build-merger@google.com> 1462399296 +0000

Merge "Remove <utils/ashmem.h>."
am: f9f76146a1

* commit 'f9f76146a1d0f05654be8963e78c2ed6c56d4a57':
  Remove <utils/ashmem.h>.

Change-Id: I2404bef3218617fb06dcb62f52717f61d83f52d8