| commit | 9010988f55da1fd89b696bad283cba8dc176cbdf | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Aug 27 05:12:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:12:51 2015 +0000 |
| tree | f07b202ea380fb956bc11373d8993a1015b55f60 | |
| parent | 1843d48330fbe202241da4ab61e8ba1bc8a17dfd [diff] | |
| parent | d5dceea52af1677714e2fc2b66543ac2a93ddcfe [diff] |
am d5dceea5: (-s ours) am 9079207a: am dfd082b9: Merge "Native/opengl: Remove unused variables from test" * commit 'd5dceea52af1677714e2fc2b66543ac2a93ddcfe':