OSDN Git Service

(root) / android-x86 / art.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 942084e 645f987)
am 645f9871: Merge "Add native memory accounting through custom allocator."
authorMathieu Chartier <mathieuc@google.com>
Sat, 30 Aug 2014 02:44:01 +0000 (02:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 30 Aug 2014 02:44:01 +0000 (02:44 +0000)
* commit '645f9871115e82ff836397f6470cca825befd245':
  Add native memory accounting through custom allocator.

1  2 
runtime/Android.mk patch | diff1 | diff2 | blob | history
runtime/gc/heap.cc patch | diff1 | diff2 | blob | history

diff --cc runtime/Android.mk
Simple merge
diff --cc runtime/gc/heap.cc
Simple merge
art
About OSDN
Find Software
Develop Software
Help