tree 37ef69c135787cfe3b0efab199054bad84afc312
parent ab6cc15afdd25969dfbbb40f905d574fef089053
parent 72b6f4fae22477a2d35c2cf6b9de4053ec0b731f
author Elliott Hughes <enh@google.com> 1490124041 +0000
committer android-build-merger <android-build-merger@google.com> 1490124041 +0000

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

Change-Id: I497096763a796e0e69643d2240d3608eb169104d