OSDN Git Service

resolved conflicts for merge of 69da8a12 to klp-modular-dev-plus-aosp
authorNarayan Kamath <narayan@google.com>
Thu, 1 May 2014 14:32:20 +0000 (15:32 +0100)
committerNarayan Kamath <narayan@google.com>
Thu, 1 May 2014 14:32:20 +0000 (15:32 +0100)
commit3a951e52d93697b7e232501b78f9ffb0ec605516
treed844f7c0f812791dbb00eb138ecb38cdb791856c
parentd2ec8724d2a3407e28161299d44e2e113fe437ec
parent69da8a124e640c09d00546761c0502e1bcab79a6
resolved conflicts for merge of 69da8a12 to klp-modular-dev-plus-aosp

Change-Id: Ie07b88f324749afcf8417b50d4dbbc6e2a271a2a
core/java/android/os/Build.java
core/java/android/os/Process.java
services/core/java/com/android/server/pm/Installer.java
services/core/java/com/android/server/pm/PackageManagerService.java