diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-07-14 16:46:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-14 16:46:12 +0000 |
| commit | 21a0f80f87873ee1239ee02113475adb82af6a6c (patch) | |
| tree | 669120f0f376275d65f9239c97b322efe3126520 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 17dce3432f93fcc33c2eedae3b1d3bbd2b5301c3 (diff) | |
| parent | 5eaf24126d4496f9a157280007b8bb89500a3ea1 (diff) | |
am 5eaf2412: am 10633c96: Merge "Fix Android Keystore key factories to obey JCA contract." into mnc-dev
* commit '5eaf24126d4496f9a157280007b8bb89500a3ea1':
Fix Android Keystore key factories to obey JCA contract.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions