OSDN Git Service

Merge "Ensure trust agents are only provided by platform packages" into lmp-preview-dev
authorAdrian Roos <roosa@google.com>
Wed, 4 Jun 2014 13:18:39 +0000 (13:18 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 4 Jun 2014 13:18:40 +0000 (13:18 +0000)
commit1e9021aef89d53eb08d0e8a4e017c9e79d260241
tree03274d0ca036f85ca0e45c7ffa68a3cf7964116f
parentd55c56b86e9ec7b15f5b9e715ed009aed6ba9bb1
parent18ea893a2319e2a192188d2288bb881149c9b06e
Merge "Ensure trust agents are only provided by platform packages" into lmp-preview-dev
core/res/AndroidManifest.xml
core/res/res/values/strings.xml