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