OSDN Git Service

(root) / android-x86 / art.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc9f8c0 2fd08e2)
am 2fd08e2d: Merge "Fix compilation errors when setting kTracing = true."
authorIan Rogers <irogers@google.com>
Wed, 11 Jun 2014 20:21:07 +0000 (20:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 11 Jun 2014 20:21:07 +0000 (20:21 +0000)
* commit '2fd08e2d497261521ad94b3162eeed1a3ef51e13':
  Fix compilation errors when setting kTracing = true.


Trivial merge
art
About OSDN
Find Software
Develop Software
Help