| commit | 4b79bbeaa3c6a8820fe83aa75179b6cae550320f | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Tue Apr 07 17:58:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 07 17:58:00 2015 +0000 |
| tree | 29ac46002d626c115158450da6f246a9595982d7 | |
| parent | aa94389ba2f848a98c74b439da6ea8c3329668ce [diff] | |
| parent | 558184f52fa7822a0bde230a93e552f137ac91a4 [diff] |
am 558184f5: Merge "Make the new AndroidKeyStore API conformant." * commit '558184f52fa7822a0bde230a93e552f137ac91a4': Make the new AndroidKeyStore API conformant.