tree ca4524f19cd4dc93146ac1b459e0bf71cac42234
parent 393f89f26df724a3da7a21b28925a21fe5fb253f
parent 38bb642bbb57131ef646c33ffc69ed07e4c957c5
author Alex Klyubin <klyubin@google.com> 1428515472 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1428515473 +0000

Merge "Add BlockMode.GCM constant to AndroidKeyStore API."