tree 2cbb4b6086c7d7b4be26b48e559b45ec36168e29
parent 98b40aac8399d8befc5099955a34ce54df477d8f
parent 4a0ff7ca984d29bd34b02e54441957cad65e8b53
author Alex Klyubin <klyubin@google.com> 1434044407 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1434044409 +0000

Merge "Android Keystore keys are no longer backed by Conscrypt." into mnc-dev