OSDN Git Service

(root) / android-x86 / bionic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69fde6b 2b10e2f)
resolved conflicts for merge of 2b10e2f1 to lmp-dev-plus-aosp
authorAndreas Gampe <agampe@google.com>
Wed, 3 Sep 2014 05:02:48 +0000 (22:02 -0700)
committerAndreas Gampe <agampe@google.com>
Wed, 3 Sep 2014 05:02:48 +0000 (22:02 -0700)
Change-Id: Ia41583773abbbe1f52d72d1e7f4b925e621d28ff

1  2 
libc/include/stdatomic.h patch | diff1 | diff2 | blob | history

diff --cc libc/include/stdatomic.h
Simple merge
bionic
About OSDN
Find Software
Develop Software
Help