| commit | c4fa0235d30da7e83fd5f5183642ff0e5fbb4637 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Feb 09 02:33:15 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Feb 09 02:33:15 2017 +0000 |
| tree | 994fbb354afcfe5cc1d29dd9da9cb65d2a9816e9 | |
| parent | ef6bdd93ab8c82fdcaa5bfd92b358c51bb30aab1 [diff] | |
| parent | 4ebf9036f82db591261c9adf2e05c9ebf668f135 [diff] |
Merge "Update BasicKeyStore sample for new keystore APIs. am: 6f3586bc08 am: 53ca307ed6 am: 619cc1fecd" into nyc-mr2-dev-plus-aosp