OSDN Git Service

"resolved conflicts for merge of 3a73bd to master"
authorAndy McFadden <fadden@android.com>
Fri, 5 Jun 2009 23:47:44 +0000 (16:47 -0700)
committerAndy McFadden <fadden@android.com>
Fri, 5 Jun 2009 23:47:44 +0000 (16:47 -0700)
commit43c01df9b5a033e8de953d112940d1a8b76a0209
tree61a2106f5d871b1d6847b12762e530d237d138d0
parent46cd5b63c29d3284a9ff3e0d0711fb136f409313
parent3a73bd95c7ea75a8e3814f76f4059c9ee7822fe0
"resolved conflicts for merge of 3a73bd to master"
vm/Jni.c