Commit 79d88ed7 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "pthread barrier and spinlock types should only appear at API level 24." am: 72b6f4fa 

am: 6d601798

Change-Id: I28bb0f6829d8d83a6bddda6e66aedc33d788ffe1
parents b05bc936 6d601798
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment