3b91bd21731de804af29d42d77b5c70d67838a4e - platform_frameworks_base

commit	3b91bd21731de804af29d42d77b5c70d67838a4e	[log] [tgz]
author	Todd Kennedy <toddke@google.com>	Fri Sep 25 15:06:49 2015 -0700
committer	Rom Lemarchand <romlem@google.com>	Mon Nov 16 10:43:53 2015 -0800
tree	da198c92e97e2dd086d9743b7a3667cd76358a80
parent	4f72447fbfdf950d76050840efeab3e57f55cefe [diff]

resolved conflicts for 7de7e0b0 to stage-aosp-master

(cherry picked from commit 9f8602644418ecfb1a5c9555792ceed285fa72bd)

Change-Id: I4e45e5bbaebb98b0e740167eaf7517f99d917f30

core/java/com/android/internal/os/InstallerConnection.java[diff]
core/java/com/android/internal/os/ZygoteInit.java[diff]
services/core/java/com/android/server/pm/Installer.java[diff]
services/core/java/com/android/server/pm/PackageDexOptimizer.java[diff]
services/core/java/com/android/server/pm/PackageManagerService.java[diff]

5 files changed

tree: da198c92e97e2dd086d9743b7a3667cd76358a80