Merge "Remove unnecessary dependency on keystore_client"
authorKenny Root <kroot@google.com>
Wed, 14 Nov 2012 23:53:20 +0000 (15:53 -0800)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 14 Nov 2012 23:53:20 +0000 (15:53 -0800)

Trivial merge