OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bac1337 07c6628)
resolve merge conflicts of 07c6628d68 to master.
authorJeff Sharkey <jsharkey@android.com>
Fri, 30 Oct 2015 22:44:58 +0000 (15:44 -0700)
committerJeff Sharkey <jsharkey@android.com>
Fri, 30 Oct 2015 22:44:58 +0000 (15:44 -0700)
commitdf5f870d989bd1f3c94466adace1e3879d77178e
tree6df1d843fb3dc29fc607a45d68bf822ee53b0536tree | snapshot
parentbac13378ca2490e98e814908984bc9184ed1d42bcommit | diff
parent07c6628d68da39582d8d682bc9c849be8bfaaa10commit | diff
resolve merge conflicts of 07c6628d68 to master.

Change-Id: I29c9b408956c578ce1cfe0eb5d8704b7a5d2f818
services/core/java/com/android/server/pm/PackageManagerService.java diff1 | diff2 | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help