OSDN Git Service

(root) / android-x86 / art.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f87368 1bef4af)
am 1bef4afe: resolved conflicts for merge of f717cfc6 to mnc-dev-plus-aosp
authorNicolas Geoffray <ngeoffray@google.com>
Thu, 25 Jun 2015 16:03:22 +0000 (16:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 25 Jun 2015 16:03:22 +0000 (16:03 +0000)
* commit '1bef4afe828aeed8f47b27ac649c0cf2dc1c433e':
  Only do some checks when compiling against the core image.


Trivial merge
art
About OSDN
Find Software
Develop Software
Help