OSDN Git Service

Merge changes from topic "cp_calin_framework_2017" am: b98102b4dc
authorCalin Juravle <calin@google.com>
Thu, 15 Feb 2018 21:30:27 +0000 (21:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Feb 2018 21:30:27 +0000 (21:30 +0000)
commit5a0b4c4c625ba469c8358fdc3c9addc17d0011e1
treeaf1aad54ffa5db439fc13f1e4dc49f1f57e3bfb2
parent0a6ca96902c86d3c5ffd18347db7ee3a240cc6c1
parentb3da44d9a1560c8b3092ef66081db135d1ff4c4f
Merge changes from topic "cp_calin_framework_2017" am: b98102b4dc
am: b3da44d9a1

Change-Id: Ibd848f6803d63da46ae1461b469422c5a6431980
core/java/android/content/pm/PackageParser.java
core/res/AndroidManifest.xml
services/core/java/com/android/server/pm/PackageManagerService.java