OSDN Git Service

Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZyg...
authorRobert Sesek <rsesek@google.com>
Fri, 2 Dec 2016 17:15:23 +0000 (17:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 17:15:23 +0000 (17:15 +0000)
commitbbcd9d26b13117c867cd6be6812f7f330c1e8554
treeba6bd6af2154b5f5c0dac4543d9e14693cfd86a3
parent33f0cf1267a345ae80a345d72f8e3746167ee1f4
parenteda1af611fd9542693a35c6ead405159b950ff76
Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote."
am: eda1af611f

Change-Id: I539fb728175c109a93cbff7d8929b584e88bb70c
services/core/java/com/android/server/am/ActiveServices.java
services/core/java/com/android/server/am/ActivityManagerService.java