diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-07-14 16:28:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-14 16:28:28 +0000 |
| commit | 5eaf24126d4496f9a157280007b8bb89500a3ea1 (patch) | |
| tree | 7bc16dbd8c8006c4d86ea42a7b87211e2c737190 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | be27832bba3291be6eb11cc449c9730ea265f3dc (diff) | |
| parent | 10633c96b55d13f05304b758b01be48035adece3 (diff) | |
am 10633c96: Merge "Fix Android Keystore key factories to obey JCA contract." into mnc-dev
* commit '10633c96b55d13f05304b758b01be48035adece3':
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