OSDN Git Service
(root)
/
android-x86
/
art.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
378cecf
e5ed385
)
am e5ed385b: resolved conflicts for merge of 53cb9daa to mnc-dev-plus-aosp
author
Nicolas Geoffray
<ngeoffray@google.com>
Wed, 24 Jun 2015 17:06:36 +0000
(17:06 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 24 Jun 2015 17:06:36 +0000
(17:06 +0000)
* commit '
e5ed385b52cd7ab081c27923a265df9544c6da69
':
Use a flag from the verifier to know if we should compile.
Trivial merge