tree 422ecc2bc4eb3916b2afaa0aedabc2d2ebbaa784
parent ecd5fa559e7a5b83a09a837bb962f499b710a978
parent 37d7bd1fd174d3d22169ffc9a39b9c72c76fa21d
author Elliott Hughes <enh@google.com> 1517258499 +0000
committer android-build-merger <android-build-merger@google.com> 1517258499 +0000

Merge "Use sigprocmask rather than sigblock/sigsetmask." am: 4a0797c9d6 am: 90ea50bba9
am: 37d7bd1fd1

Change-Id: I76506a14d4925e5a9ede9300644b255c1c73a087