tree d0509d210310b57a974edf7b7c44ed738e5f279a
parent 8ffb574a5087b2099cef5f629568375caa0ddc9c
parent bc4f2ccf6cfd1a512ad907eda2713ea3c4a1755e
author Jim Miller <jaggies@google.com> 1424887497 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1424887498 +0000

Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev