OSDN Git Service

am a5a93f55: am 7f416631: Merge "Check feature bits before loading optional services...
authorAdam Lesinski <adamlesinski@google.com>
Thu, 6 Feb 2014 20:25:51 +0000 (20:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Feb 2014 20:25:51 +0000 (20:25 +0000)
commit9f97de13359662c2709eed227b3fab2ce7d5dabc
tree7eb16083cd5fd9d30999dfdead280311084c3e5a
parent2b1252ddd2650cb38918cb85d2a3711b2cfa8db5
parenta5a93f559d337ad5b79716b05ea43707eb779dc8
am a5a93f55: am 7f416631: Merge "Check feature bits before loading optional services" into klp-modular-dev

* commit 'a5a93f559d337ad5b79716b05ea43707eb779dc8':
  Check feature bits before loading optional services
services/core/java/com/android/server/am/ActivityManagerService.java
services/java/com/android/server/SystemServer.java
services/print/java/com/android/server/print/PrintManagerService.java