Commits
Shawn Willden authored and Android Git Automerger committed 1cb119d3f09M
am 71ba4e46: Merge "Unbreak obtaining symmetric keys from AndroidKeyStore." * commit '71ba4e461f7a492b44632e282e6480345ac4b9c8': Unbreak obtaining symmetric keys from AndroidKeyStore.
Showing diff to99e23088843