OSDN Git Service

am 9e289d70: am 1d26a3f1: am 09e13cc5: Merge "System services detect and register...
authorNarayan Kamath <narayan@google.com>
Thu, 10 Apr 2014 09:45:18 +0000 (09:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 10 Apr 2014 09:45:18 +0000 (09:45 +0000)
commitf148f36d140e995ec8f755e60bbb0b37f33c3da7
treef23cb4b5def551a8072cf15939c3ef1b1c39cf5f
parentd11f223c535ed9ce628fe5aaf0fd5692dd0cf9e4
parent9e289d70a8baaed0030413b5991653792e2a816d
am 9e289d70: am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs"

* commit '9e289d70a8baaed0030413b5991653792e2a816d':
  System services detect and register app CPU ABIs
core/java/android/content/pm/ApplicationInfo.java
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/pm/PackageManagerService.java
services/core/java/com/android/server/pm/PackageSettingBase.java
services/core/java/com/android/server/pm/Settings.java