OSDN Git Service

resolved conflicts for merge of e206e7c9 to jb-mr1-dev-plus-aosp
authorNick Kralevich <nnk@google.com>
Fri, 19 Oct 2012 22:00:49 +0000 (15:00 -0700)
committerNick Kralevich <nnk@google.com>
Fri, 19 Oct 2012 22:00:49 +0000 (15:00 -0700)
commit7c3fb24095a3f6cf2ca6e25ddb4af24933ff3e4d
treece0c9ab900e80c02f73acb4cea8950f250ce4480
parenta753f156cbdf410f8b1ea9605d98f8eddf963ee6
parente206e7c9f1c58c77ca51f6e80483c94f6c779e4e
resolved conflicts for merge of e206e7c9 to jb-mr1-dev-plus-aosp

Change-Id: I52fcfbdeb6bbb39c5330ce2be589ec546805aa1f
vm/native/dalvik_system_Zygote.cpp