Commit 2bd3f014 authored by Yan Yan's avatar Yan Yan Committed by android-build-merger
Browse files

Merge "Add methods for generating keying material" am: ab46c239 am: 7e00699a 

am: 54f9944f

Change-Id: I0011e1cb9165b45c68528f9b58c32b78b24a5086
parents e451d7c8 54f9944f
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment