tree 8e4e72ee3acafabbe87dd16dd575e61840a6d608
parent 0f442b9c88886116ff6a4b77d6db7db3ea3ca2e0
parent 5ab73e945d59472ed47ea2e0deee613c958d800c
author Paul Crowley <paulcrowley@google.com> 1447670173 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1447670173 +0000

Merge "Add --no-unlink option to secdiscard for testing."