OSDN Git Service

resolved conflicts for merge of b6d6c04a to master
authorAndreas Gampe <agampe@google.com>
Tue, 10 Mar 2015 22:36:20 +0000 (15:36 -0700)
committerAndreas Gampe <agampe@google.com>
Tue, 10 Mar 2015 22:45:36 +0000 (15:45 -0700)
commit2c1078fbbd550d8adb7ca0d39447bfebc6092012
tree5a8b61e3f7e7c2223e67ae4bdd1e41235a1649cf
parentc4be90872685c4507b516e96040d57a796792165
parentb6d6c04a717222178184bff135bd12cfc4c019a1
resolved conflicts for merge of b6d6c04a to master

Change-Id: I5286b9fe2d9bde4b219496e593cf028cc4c75bc7
services/core/java/com/android/server/pm/PackageDexOptimizer.java