tree 5f3188b527d17aff29fc7d50cd5c62ddcf17f4ab
parent 5865ee9ab8e2c2efd03ad505fcae290570343aef
parent 55d7fcea34fcdb47edde839f721da4dc66885eca
author Elliott Hughes <enh@google.com> 1518644932 +0000
committer android-build-merger <android-build-merger@google.com> 1518644932 +0000

Merge "Add uc_sigmask64." am: 38a78728c3
am: 55d7fcea34

Change-Id: I573a6231b0ce1852a1bdc1f380c5c19cde54286e