tree 2eabc341acee4aa318654cdb471bc4733d466f16
parent 06d914c84119acd7059ee0e76aac8fc703ce83c1
parent 6e8ffe3f1e328ee71354b539e63b34b2342160a8
author Nick Kralevich <nnk@google.com> 1388692499 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1388692499 -0800

am 6e8ffe3f: Merge "Allow execmem and ashmem_device execute as required."

* commit '6e8ffe3f1e328ee71354b539e63b34b2342160a8':
  Allow execmem and ashmem_device execute as required.