OSDN Git Service

am 4a29a80f: resolved conflicts for merge of 08ff8021 to lmp-dev-plus-aosp
authorHans Boehm <hboehm@google.com>
Wed, 3 Sep 2014 13:49:01 +0000 (13:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 3 Sep 2014 13:49:01 +0000 (13:49 +0000)
commit78b26747e218ee394664230b4a901ad56c292d6d
tree74e041bb77c85af774f924909775956df9e7f739
parent53047e593dc7cc1d2cfb651e17373dfa7ff57fc1
parent4a29a80fff163a86959be2e3eb0f4a9d739b5f7d
am 4a29a80f: resolved conflicts for merge of 08ff8021 to lmp-dev-plus-aosp

* commit '4a29a80fff163a86959be2e3eb0f4a9d739b5f7d':
  Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""