tree 344b66a6eee49cd8310b86c42734ccdc9866b69a
parent bb463806aa9a83d10cfff5f565eebd71d500ae4e
parent b46e48067fd03b63fa5f5191651ac2a5d009e226
author Jim Miller <jaggies@google.com> 1424887794 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424887794 +0000

am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev

* commit 'b46e48067fd03b63fa5f5191651ac2a5d009e226':
  Remove TrustAgent whitelisting API