tree 0ac9a972c8f682b370b7fd84a37ef3261e9ede59
parent 3182a92a1687051f5e4ceaee5dd9cebafb7a7758
parent 5c21c7037192128b2cbcc42c596e290c001f4090
author Paul Lawrence <paullawrence@google.com> 1454450043 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1454450043 +0000

Merge "Add APIs to allow detection of encryption type"