OSDN Git Service

(root) / android-x86 / dalvik.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c08071 0c632a8)
am 0c632a84: Merge "Add isDebuggerActive API for the finalizer watchdog."
authorJesse Wilson <jessewilson@google.com>
Tue, 21 Jun 2011 03:26:56 +0000 (20:26 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 21 Jun 2011 03:26:56 +0000 (20:26 -0700)
* commit '0c632a8484839ceeffc6fdf04c310c02c7531530':
  Add isDebuggerActive API for the finalizer watchdog.

1  2 
vm/alloc/Alloc.cpp patch | diff1 | diff2 | blob | history
vm/native/dalvik_system_VMRuntime.cpp patch | diff1 | diff2 | blob | history

diff --cc vm/alloc/Alloc.cpp
Simple merge
diff --cc vm/native/dalvik_system_VMRuntime.cpp
Simple merge
dalvik
About OSDN
Find Software
Develop Software
Help