diff options
| author | Marco Nelissen <marcone@google.com> | 2014-03-20 13:22:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 13:22:34 -0700 |
| commit | 5035faba9a28f988291c4ff3d3cbf64d828f3f5a (patch) | |
| tree | f9c292696cfa4782257ec92cbc69dd85747e0227 /rs/java/android/renderscript/RenderScriptGL.java | |
| parent | e9c7fd2f2ee7840c61dc66ead3737e437f4e8c10 (diff) | |
| parent | cecc62086a6ac7c17ce87d6fab1a4364b8d96cd7 (diff) | |
am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev
* commit 'cecc62086a6ac7c17ce87d6fab1a4364b8d96cd7':
Verify certificates
Diffstat (limited to 'rs/java/android/renderscript/RenderScriptGL.java')
0 files changed, 0 insertions, 0 deletions