OSDN Git Service

resolved conflicts for b4d41021 to master
authorTodd Kennedy <toddke@google.com>
Mon, 28 Sep 2015 18:47:19 +0000 (11:47 -0700)
committerTodd Kennedy <toddke@google.com>
Mon, 28 Sep 2015 18:47:19 +0000 (11:47 -0700)
commit6b78340f6cfa49341bfdcc6e0b80a697d76f5b0f
treed09803ec866fd000524d6c5c848ab7a82e3a8442
parentdfc9ce547760e8a746bfb036e3b44848d48c175d
parentb4d41021b41b60ce0b053035105d51f453816b1d
resolved conflicts for b4d41021 to master

Change-Id: Ib413c588ffb7a2b4385d2088e6de782417625037
services/core/java/com/android/server/pm/PackageManagerService.java