tree 532e55bf997196493387f5d0c159ed4e5961422d
parent 8623f89c32abf697aa2d90698382e43e97635d56
parent 666484d54d0da771e107f396b33891c2dc4d8f6d
author Zac Iqbal <zacharyi@google.com> 1491271994 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1491271998 +0000

Merge "Added a whitelist for factory trust agents."