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:29:11 +0000 (19:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 21 Mar 2017 19:29:11 +0000 (19:29 +0000)
commit4b7c564b3354f8c955b31efe0c9d2153f276d832
tree37ef69c135787cfe3b0efab199054bad84afc312
parent120ec4a8f7cef532bd853fd18168ea2115c1d44a
parent79d88ed706996b3826b4d9f28aae05d86eeec8c9
Merge "pthread barrier and spinlock types should only appear at API level 24." am: 72b6f4fae2 am: 6d60179839
am: 79d88ed706

Change-Id: Ieeaf1db4f62230da8f690dda02ea375b43b6682b