OSDN Git Service

Merge changes from topic 'dex'
authorCalin Juravle <calin@google.com>
Wed, 29 Mar 2017 01:27:37 +0000 (01:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 29 Mar 2017 01:27:37 +0000 (01:27 +0000)
commit8a4afd3dad21ff046e2dffb3cd8723ea8417057b
tree2eb3449e3a451a7e64f43689dd97e3ac6f28da13
parent75172f2909a3cc7868f1d44a8a1cb6708dca3f0f
parentf665781c7424f7dba2df63c8f51f69e7ab5937a7
Merge changes from topic 'dex'
am: f665781c74

Change-Id: I31c202a56d8f92634cc1d5d84106e27cb8c23bfd
core/java/android/app/ActivityThread.java
services/core/java/com/android/server/pm/PackageManagerService.java