tree 5e8d0aadca57bc428e2ab6a5ad54f95f7f076a45
parent e64f618f2a665b9cd53f4ac99e314481641f29c6
parent ab899d8127b5f7fc1b7ffc6d4607188e74ff106c
author Jim Miller <jaggies@google.com> 1424888993 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424888993 +0000

am ab899d81: am e7ff5d43: am 6961862c: Remove TrustAgent whitelisting API

* commit 'ab899d8127b5f7fc1b7ffc6d4607188e74ff106c':
  Remove TrustAgent whitelisting API