OSDN Git Service

am c16f0486: resolved conflicts for merge of 2b10e2f1 to lmp-dev-plus-aosp
authorAndreas Gampe <agampe@google.com>
Wed, 3 Sep 2014 09:12:50 +0000 (09:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 3 Sep 2014 09:12:50 +0000 (09:12 +0000)
commit4e092df34a4e8699a6b75c475f2e926ac94100af
treeecd28f809d0c68cba697afc65f6c2cbe9323aebd
parent763d17e22f7fb45fd578ce22ca6ccb08232ba51f
parentc16f0486fca0df1125cc381d3f4ef3b652d72d29
am c16f0486: resolved conflicts for merge of 2b10e2f1 to lmp-dev-plus-aosp

* commit 'c16f0486fca0df1125cc381d3f4ef3b652d72d29':
  Undefine _Atomic before redefining