OSDN Git Service

Merge "pthread barrier and spinlock types should only appear at API level 24." am...
authorElliott Hughes <enh@google.com>
Tue, 21 Mar 2017 19:24:41 +0000 (19:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 21 Mar 2017 19:24:41 +0000 (19:24 +0000)
commit79d88ed706996b3826b4d9f28aae05d86eeec8c9
tree37ef69c135787cfe3b0efab199054bad84afc312
parentb05bc9364f7c90d3a539d5f3d5320db914066929
parent6d601798392467be4586e9ae3cdb0bb37ca55f01
Merge "pthread barrier and spinlock types should only appear at API level 24." am: 72b6f4fae2
am: 6d60179839

Change-Id: I28bb0f6829d8d83a6bddda6e66aedc33d788ffe1