OSDN Git Service

am 7af8f5ba: am 10d57c4b: Merge "Fix two zygote imports."
authorElliott Hughes <enh@google.com>
Tue, 29 Apr 2014 04:05:25 +0000 (04:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 29 Apr 2014 04:05:25 +0000 (04:05 +0000)
commit45641ecd2c4be60390319614f519d2313dbd547d
treeb65e1adf12a7708b52810aea4c281ee429ce2fab
parentc4e6f6d2827ad526f562a5882975f42eee69486c
parent7af8f5ba9cc7801fabe70bcf13e602aaa73dc428
am 7af8f5ba: am 10d57c4b: Merge "Fix two zygote imports."

* commit '7af8f5ba9cc7801fabe70bcf13e602aaa73dc428':
  Fix two zygote imports.
core/java/com/android/internal/os/ZygoteInit.java