tree 7f4e34290a9a0051813cee5f34bb954f6e938d74
parent 9c5b7b094254cad0a8a90ece5ea650c49694087d
parent 692e4933f01f5f7d0c16dcbcd96127897d054511
author Robin Lee <rgl@google.com> 1416943063 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416943063 +0000

am 692e4933: Merge "DevicePolicy: Don\'t warn about managed profile CAs" into lmp-mr1-dev

* commit '692e4933f01f5f7d0c16dcbcd96127897d054511':
  DevicePolicy: Don't warn about managed profile CAs