tree 98b74241c0c1ddb2af1ddb9b0ed38a7b0b1502a3
parent cb7e4d6c3315144cc1c9aea8f71f50ded828ac9e
parent c0df2e6737bc12fa88cbdcfa76a9c102b0e464c9
author Elliott Hughes <enh@google.com> 1485817557 +0000
committer android-build-merger <android-build-merger@google.com> 1485817557 +0000

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

Change-Id: Icab6d6f2d97d841bb5dff74d4316bc7012b4c0f6