tree 98b74241c0c1ddb2af1ddb9b0ed38a7b0b1502a3
parent ebd62e015cf90eb033414feabb58891496cafa00
parent cf41806599b7d50ed4c91aab3815154b8c64324a
author Elliott Hughes <enh@google.com> 1485817834 +0000
committer android-build-merger <android-build-merger@google.com> 1485817834 +0000

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

Change-Id: I419b3f50f6734c42d44caa12b0630f92ad3cd9e4