summaryrefslogtreecommitdiffstats
path: root/tests/Assist/AndroidManifest.xml
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-04-24 18:21:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-24 18:21:22 +0000
commitedf5454a14cc53de92eaf1ef15fcfb21d8caccca (patch)
treec84422d8789733fd3bf0c7ae7351db84251dd317 /tests/Assist/AndroidManifest.xml
parent3846d3a4c5d79a9d7e86e43c64a5c21a29036de0 (diff)
parent3167fb4b6e190705d21a76b34cc376a89675a6a0 (diff)
downloadframeworks_base-edf5454a14cc53de92eaf1ef15fcfb21d8caccca.zip
frameworks_base-edf5454a14cc53de92eaf1ef15fcfb21d8caccca.tar.gz
frameworks_base-edf5454a14cc53de92eaf1ef15fcfb21d8caccca.tar.bz2
am 3167fb4b: am 71223ebe: Merge "Reset AndroidKeyStore Mac and Cipher state when init fails."
* commit '3167fb4b6e190705d21a76b34cc376a89675a6a0': Reset AndroidKeyStore Mac and Cipher state when init fails.
Diffstat (limited to 'tests/Assist/AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions