tree ed5d4387a1cb0c146dd53853e4120683b57e46c1
parent 8355c500ea6f809ef2e6885aee673d39f1cb223b
parent e303bf443532c2ad756260133f00747bcff11e69
author Jim Miller <jaggies@google.com> 1415242339 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1415242340 +0000

Merge "Update TrustAgentService API after review" into lmp-mr1-dev