diff options
| author | Bart Sears <bsears@google.com> | 2015-06-20 05:59:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-20 05:59:09 +0000 |
| commit | 2f97ec825f14369d924d9e2d01c45b14cd43fd09 (patch) | |
| tree | de84597cfdd181b259fd0bb8ec6b818b898074d0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6e2fce4406af299e5e70808d5863691b929c717e (diff) | |
| parent | 48f94aac65e09504f85b2cd12492145e266b488c (diff) | |
am 48f94aac: am 1b96f013: am 950aa197: Merge "Revert "Clarify handling client certificates"" into mnc-dev
* commit '48f94aac65e09504f85b2cd12492145e266b488c':
Revert "Clarify handling client certificates"
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions