diff options
| author | Marco Nelissen <marcone@google.com> | 2014-03-20 10:47:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 10:47:34 -0700 |
| commit | 665b07579aa2a74bb5425d543892da40d78b7ef8 (patch) | |
| tree | 8cf31849d8f736ab8f4840c00fa85657528b951f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3191212259b1629cf8174416adf01522b88501ad (diff) | |
| parent | 81fbdade8db4117157ea48602be121e6cf5597dd (diff) | |
am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev
* commit '81fbdade8db4117157ea48602be121e6cf5597dd':
Verify certificates
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions