commit | 96d7058aaaf58a0c6a2bfb296c5950b2e7e37d37 | [log] [tgz] |
---|---|---|
author | Alex Klyubin <klyubin@google.com> | Thu Jun 11 17:40:07 2015 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 11 17:40:09 2015 +0000 |
tree | 2cbb4b6086c7d7b4be26b48e559b45ec36168e29 | |
parent | 98b40aac8399d8befc5099955a34ce54df477d8f [diff] | |
parent | 4a0ff7ca984d29bd34b02e54441957cad65e8b53 [diff] |
Merge "Android Keystore keys are no longer backed by Conscrypt." into mnc-dev