tree 93ab2b82202f9c5e317f7122f2f4a72a50709ef3
parent 5c0038f3a80582bac0750c119fb8d589e4d93ef0
parent 6bdfbabd01fc80e1c7fc25270daf2073512746f5
author Elliott Hughes <enh@google.com> 1472605346 +0000
committer android-build-merger <android-build-merger@google.com> 1472605346 +0000

Merge "Fix SysV IPC test failures on Android devices." am: af730e63a3 am: c5b5e3adc8 am: 85256c71ab
am: 6bdfbabd01

Change-Id: I85a6cc18cb3c364beb8c74f7ad347bb2bee67518