diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-30 16:25:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-30 16:25:33 +0000 |
| commit | 84c64efef90818888dca12f7650a632b70438a8f (patch) | |
| tree | a90084dea52c08cf168d06d8d84679f106921efd /tools/aidl/generate_java.cpp | |
| parent | 19b9f8ef3eaf392db0a993ae0d5a7a84e9d6c60f (diff) | |
| parent | 403ac2d64f7ad53ecf9ccd713951cf151ea2f2bc (diff) | |
am 403ac2d6: Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc-dev
* commit '403ac2d64f7ad53ecf9ccd713951cf151ea2f2bc':
AndroidKeyStore keys should not be handled by Bouncy Castle.
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions