OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 53047e5 4a29a80)
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)
* commit '4a29a80fff163a86959be2e3eb0f4a9d739b5f7d':
  Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help