OSDN Git Service

am d4e7dcb9: am 15e2c54a: Merge "Check DISALLOW_CONFIG_CREDENTIALS on Settings >...
authorZoltan Szatmary-Ban <szatmz@google.com>
Wed, 7 Jan 2015 12:50:02 +0000 (12:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Jan 2015 12:50:02 +0000 (12:50 +0000)
commitc374175f61aff876f895cf15664ea66f54978aaf
tree212be6c4c9d587121cba700e8b077a2597022e20
parent310b533689ac9ecd6ee3e9abbd4029882522358f
parentd4e7dcb9d55ae5d5c0196f6e77c05a8d02698e16
am d4e7dcb9: am 15e2c54a: Merge "Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials" into lmp-mr1-dev

* commit 'd4e7dcb9d55ae5d5c0196f6e77c05a8d02698e16':
  Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials