diff options
| author | Marco Nelissen <marcone@google.com> | 2014-03-20 11:06:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 11:06:41 -0700 |
| commit | 072e1da26e80adb4009d063428c2ef8fb65c3d6c (patch) | |
| tree | 31da42c8fe9bb0a0a40a3a1784ad2a0b7e6a0bc4 /rs/java/android/renderscript/RenderScriptGL.java | |
| parent | 737d3e5da366124d164555009fa5ee4552143cc8 (diff) | |
| parent | b17cf207372268d91177de7efa692b2483785991 (diff) | |
am b17cf207: am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev
* commit 'b17cf207372268d91177de7efa692b2483785991':
Verify certificates
Diffstat (limited to 'rs/java/android/renderscript/RenderScriptGL.java')
0 files changed, 0 insertions, 0 deletions