OSDN Git Service

resolved conflicts for merge of 7c03fb79 to jb-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Thu, 21 Jun 2012 21:15:11 +0000 (14:15 -0700)
committerElliott Hughes <enh@google.com>
Thu, 21 Jun 2012 21:15:11 +0000 (14:15 -0700)
commit8ca227ef75cdb1511ea3b11679526a6de5a99974
tree9670eae53d83ec1d607eaa7fba8b3262a4000c37
parentde574936841bbfa9ad82b5876e214bc918ee777c
parent7c03fb79290de74c8f855275c0878e31a968665b
resolved conflicts for merge of 7c03fb79 to jb-dev-plus-aosp

Change-Id: Icedbe5a6d7cbcedde53e05249f7e90a390f2f0ea
vm/ReconfigureDvm.mk
vm/native/dalvik_system_Zygote.cpp