tree 202b05723adbf03a7ab6f9aabb2e1348ae00da7a
parent cf58d1f5fed741836f6d06820dce5502e4770dd5
parent 5c24a50e5fba6aad3319edc0770005e20ac0b9e1
author Nick Kralevich <nnk@google.com> 1444902405 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444902405 +0000

am 5c24a50e: Merge "generic_x86: delete system_server execmem"

* commit '5c24a50e5fba6aad3319edc0770005e20ac0b9e1':
  generic_x86: delete system_server execmem