OSDN Git Service

am 15e2c54a: Merge "Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentia...
authorZoltan Szatmary-Ban <szatmz@google.com>
Wed, 7 Jan 2015 12:40:42 +0000 (12:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Jan 2015 12:40:42 +0000 (12:40 +0000)
commitd4e7dcb9d55ae5d5c0196f6e77c05a8d02698e16
tree1e62902b274d142e41e183cc27ee479f08046d43
parent2c9d75a7c379c07bf84bfc87cbe4d1a4666bfc47
parent15e2c54a2f4b75812b04bb32c6feb58158f0f318
am 15e2c54a: Merge "Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials" into lmp-mr1-dev

* commit '15e2c54a2f4b75812b04bb32c6feb58158f0f318':
  Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials