OSDN Git Service

Merge "Fix pthread_barrierattr_getpshared prototype." am: f8f2949744
authorElliott Hughes <enh@google.com>
Fri, 12 Aug 2016 19:27:06 +0000 (19:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 19:27:06 +0000 (19:27 +0000)
am: f232711408

Change-Id: I7b172d98ebd09a216886be8f2565679b166193c0


Trivial merge