tree 37a43fc1dfe032756e9c8adda475f81cad2f4152
parent 600a72784d7e928167ad0865d6ef2b2fd62a31db
parent 3f3ca3bb849b192d41b99aae775f6fc52f67118d
author Kenny Root <kroot@google.com> 1352931457 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1352931457 -0800

Merge "Switch keystore to binder"