Commits
Alex Klyubin authored and Android Git Automerger committed 3ae2e3087a9M
am e8a6a9fc: am e39a2190: am c5a142f8: Merge "Flatten KeyStoreKeyProperties constants." into mnc-dev * commit 'e8a6a9fc402798b7e800cdfef67dd4d0295c13e2': Flatten KeyStoreKeyProperties constants.
Showing diff tof0c9a76e291