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