diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-09 20:14:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-09 20:14:56 +0000 |
| commit | 21c4e465f6a4783a9356bf1d88bda42192af022f (patch) | |
| tree | cd8785a0c7e4e48b582d655fc569467125970aa8 /rs/java/android/renderscript/RenderScript.java | |
| parent | 1f799a6b96eaa74a776bc2d1b3d52b937dd1a9ea (diff) | |
| parent | 8c58ba87bb82993b2bd5dbdd948d15fe3297d08e (diff) | |
am 8c58ba87: Merge "Add missing mapping between JCA and keystore HMAC names."
* commit '8c58ba87bb82993b2bd5dbdd948d15fe3297d08e':
Add missing mapping between JCA and keystore HMAC names.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions