tree 9e9091c92ff108909d0ff2ff7091a01a075cbcf7
parent d48794a9af157982a6953387e363a2e24e6343f4
parent 993f5338fae46a410585a061e457de3d12ef0db7
author Peter Collingbourne <pcc@google.com> 1542064217 -0800
committer android-build-merger <android-build-merger@google.com> 1542064217 -0800

Merge "bionic: Add shadow call stack guard region field to pthread_internal_t." am: b87e85aac3
am: 993f5338fa

Change-Id: I6b411ab9e7a1792f970f065e32275708f3678e15