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