Commits
Alex Klyubin authored and Android Git Automerger committed 50956c152aeM
am ceb3b523: am f48be6d7: am 84a378f2: Merge "Fix a bug in Android Keystore updateAAD." into mnc-dev * commit 'ceb3b523874793d50b91dd30276386508061342a': Fix a bug in Android Keystore updateAAD.
Showing diff to971e091d523