summaryrefslogtreecommitdiffstats
path: root/nfc-extras
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-06-15 22:42:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-15 22:42:04 +0000
commita8232452b6bea3c291a56a4e005e7a95eb99c5de (patch)
tree423e8e7872ae66677a3f908b8255d2c3cbde53d6 /nfc-extras
parent9f6d39f84423d59705c0c7a8746d40cc610caee7 (diff)
parentf78dd677e991ba8f76f3a6d4272ff5deef3faa69 (diff)
downloadframeworks_base-a8232452b6bea3c291a56a4e005e7a95eb99c5de.zip
frameworks_base-a8232452b6bea3c291a56a4e005e7a95eb99c5de.tar.gz
frameworks_base-a8232452b6bea3c291a56a4e005e7a95eb99c5de.tar.bz2
Merge "Fix Android Keystore key gen for keys requiring user auth." into mnc-dev
Diffstat (limited to 'nfc-extras')
0 files changed, 0 insertions, 0 deletions