resolved conflicts for merge of 2b10e2f1 to lmp-dev-plus-aosp

Change-Id: Ia41583773abbbe1f52d72d1e7f4b925e621d28ff
2014-09-02 22:02:48 -07:00 · 2014-09-02 22:02:48 -07:00 · c16f0486fc
commit c16f0486fc
parent 69fde6b4a7 2b10e2f122
1 changed files with 0 additions and 1 deletions
--- a/libc/include/stdatomic.h
+++ b/libc/include/stdatomic.h
@ -58,7 +58,6 @@
        /* included.  The definitions in <atomic> themselves see      */
        /* the old definition, as they should.                        */
        /* Client code sees the following definition.                 */
-
 #define _Atomic(t) std::atomic<t>

 using std::atomic_is_lock_free;