tree 85fbfa14268de7d38189a8fe852cb2661ecffb82
parent cc09566e74bc8f3d682cb7ea20112821b1743337
parent eaa84fc1571ccf96f7bb61f13ce06ac32408a877
author Dimitry Ivanov <dimitry@google.com> 1517417237 +0000
committer android-build-merger <android-build-merger@google.com> 1517417237 +0000

Merge "Make pthread_attr_getstack__main_thread test native-bridge friendly" am: 5dbbf78bd7
am: eaa84fc157

Change-Id: Ic11d2a34fa774754e926a3bca1a02e5d8a078d6f