tree 98b74241c0c1ddb2af1ddb9b0ed38a7b0b1502a3
parent 06223d2417b3fb8b8ad6fd0c1051951fef30c0ca
parent bef3b0ed6ef1a373982172eb6ebab24749026a88
author Elliott Hughes <enh@google.com> 1485817707 +0000
committer android-build-merger <android-build-merger@google.com> 1485817707 +0000

Keep os/android-os.h compiling now we have __key in <sys/ipc.h>. am: 61e00348b1 am: c0df2e6737
am: bef3b0ed6e

Change-Id: I55cd9b440611ad446523f5a6899d09fb8d57f1de