diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-07-23 22:07:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-23 22:07:33 +0000 |
| commit | f93f1f3617e8ac982fe582b8c876079484c5bb08 (patch) | |
| tree | a3593cdbf6c2b96996812ec54c47e557b32ba842 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5a452cdad3d5ba05b0593c3b46e175ab423a812d (diff) | |
| parent | 05984f7627f4aa5a7c12ef33f9895ad16fcb5de1 (diff) | |
am 05984f76: am 3ad84795: am b1d68c90: am 568e67a3: am ada70be8: Merge "Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys." into mnc-dev
* commit '05984f7627f4aa5a7c12ef33f9895ad16fcb5de1':
Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions