OSDN Git Service

Merge "Flesh out <sys/msg.h>, <sys/sem.h>, <sys/shm.h>." am: 7d4e28a486 am: a0a3a8c3b6
authorElliott Hughes <enh@google.com>
Fri, 19 Aug 2016 00:09:26 +0000 (00:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Aug 2016 00:09:26 +0000 (00:09 +0000)
am: 2e805b4f1a

Change-Id: Ic5cdfacb332a9cbd2a958a81f78b80099961aebf


Trivial merge