OSDN Git Service

resolve merge conflicts of b242549166 to nyc-dev
authorErik Kline <ek@google.com>
Mon, 22 Feb 2016 06:42:07 +0000 (15:42 +0900)
committerErik Kline <ek@google.com>
Mon, 22 Feb 2016 06:42:07 +0000 (15:42 +0900)
commit0f6ae2ec0df270c4ce51c87896fe01fe6e1fedfa
treeb622b7cb4441e2be628f5e1fc20884c89d96dc8a
parent13daed9fea65c45a7aaeff7224833a87a676a1b4
parentb2425491662b4d31fbcf09ab36bd10adc42a2b28
resolve merge conflicts of b242549166 to nyc-dev

Change-Id: I42d4cac95a209fdfae5769d75d90f004a94d60a4
core/jni/com_android_internal_os_Zygote.cpp