tree d50472d5481ad2149848c792656a49f4f6f9a057
parent 612501674ebb6fa0d7009ce3e32f2d41d58eb0d6
parent 62ff695bdc9a8f23454ddd8a8629ec508a4512d7
author Alex Klyubin <klyubin@google.com> 1432136386 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1432136387 +0000

Merge "Switch Android Keystore sample code to new API." into mnc-dev