commit | 45d8a3b77c26ce55bedc06cc1396df12fb8b70fa | [log] [tgz] |
---|---|---|
author | Andrew Hsieh <andrewhsieh@google.com> | Mon Apr 02 08:37:37 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 02 08:37:37 2012 -0700 |
tree | 4232bff842eb7016525f9067f35031accda9635e | |
parent | c64973f7bc56b9d3031f2b49dade1ef6a7fd1428 [diff] | |
parent | b907051f108b7c0a75845c49bb2e540ecc36fcb4 [diff] |
am b907051f: (-s ours) am 708a75ba: am ad05e868: Merge "ndk: Fix <sys/atomics.h> declarations." * commit 'b907051f108b7c0a75845c49bb2e540ecc36fcb4': ndk: Fix <sys/atomics.h> declarations.