OSDN Git Service

Merge "Add support for carrier "associated" apps." into nyc-mr1-dev
authorJeff Davidson <jpd@google.com>
Wed, 27 Jul 2016 17:57:38 +0000 (17:57 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 27 Jul 2016 17:57:39 +0000 (17:57 +0000)
commit94ae1e739fd84a308609fff3b913d0963900ed6e
tree26b4da86c4022422ea378e70fa0080441bb2ac02
parentad023e14c2926c8abdc5bc93f1bd6dec7e80a858
parent24b9d960071ecf24f1b7edf799f6a4edf20f2b95
Merge "Add support for carrier "associated" apps." into nyc-mr1-dev
core/java/android/provider/Settings.java
services/core/java/com/android/server/pm/PackageManagerService.java