tree ac376ef8e2f6ada8486df0d002f2b10edc2b5b07
parent e71a2be2ba148dc14b168127b93bb05141d7970e
parent a4da9f6b99c7452475e1b85a1feed60b22a950fd
author Adrian Roos <roosa@google.com> 1425917202 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1425917203 +0000

Merge "Remove leftover code causing trust agent issues"