OSDN Git Service

resolved conflicts for merge of ef57e5e0 to stage-aosp-master
authorYasuhiro Matsuda <mazda@google.com>
Wed, 2 Sep 2015 13:48:13 +0000 (22:48 +0900)
committerYasuhiro Matsuda <mazda@google.com>
Wed, 2 Sep 2015 13:57:53 +0000 (22:57 +0900)
commitebf9465d213336819b15e3b21d02afce64470d4f
treec561ddc0ab2431a8e525858d9e3aa214db744e9a
parent96343073d63c72afa75057129abea4f0d4f8c103
parentef57e5e03b042065e69c65e910065df7306d930c
resolved conflicts for merge of ef57e5e0 to stage-aosp-master

Change-Id: I1c31b38936dc74619dea27f0d5eecab43360bb8c
core/java/com/android/internal/os/ZygoteInit.java
core/jni/AndroidRuntime.cpp
services/core/java/com/android/server/am/ActivityManagerService.java
services/java/com/android/server/SystemServer.java