summaryrefslogtreecommitdiffstats
path: root/core/java/android/security
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-04-01 02:20:48 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-01 02:20:48 +0000
commit1dd2e88ed442dcf99e6c91ee52e626f2bf31c400 (patch)
tree45d870e867449f27bde21b7935620f7268cb4bd7 /core/java/android/security
parente0e8aa1ebca8608ac50f20b3ad069bb95a0e5962 (diff)
parentf0c71ceb8a9bbd9bbd793e599d08e29d77a509f8 (diff)
downloadframeworks_base-1dd2e88ed442dcf99e6c91ee52e626f2bf31c400.zip
frameworks_base-1dd2e88ed442dcf99e6c91ee52e626f2bf31c400.tar.gz
frameworks_base-1dd2e88ed442dcf99e6c91ee52e626f2bf31c400.tar.bz2
am f0c71ceb: am 01e53ef1: am b7a34e49: Merge "Add license banner to recently added AndroidKeyStore files."
* commit 'f0c71ceb8a9bbd9bbd793e599d08e29d77a509f8': Add license banner to recently added AndroidKeyStore files.
Diffstat (limited to 'core/java/android/security')
0 files changed, 0 insertions, 0 deletions