| commit | 06adabdbec7207e61b84d006e538a9f5ead6e79c | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Tue Apr 07 18:07:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 07 18:07:53 2015 +0000 |
| tree | 1d19995d928a791d8922e57c1bc44e1dbc9742e8 | |
| parent | f838b76f755a3f2c280b5f6c445863ce48e8e679 [diff] | |
| parent | 4b79bbeaa3c6a8820fe83aa75179b6cae550320f [diff] |
am 4b79bbea: am 558184f5: Merge "Make the new AndroidKeyStore API conformant." * commit '4b79bbeaa3c6a8820fe83aa75179b6cae550320f': Make the new AndroidKeyStore API conformant.