| commit | aed01e49ff3132c6ab62115cf8e591ed4c680fe8 | [log] [tgz] |
|---|---|---|
| author | Rob Carr <racarr@google.com> | Wed Jan 27 00:47:52 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jan 27 00:47:52 2016 +0000 |
| tree | d8f2f227f4f8a8104a836c5c6fd04478a35d171f | |
| parent | 7705a0d6ad04fb3c6f32c7700d09f13fdf7c9cee [diff] | |
| parent | d4393b28978e45f67ace6530338c01ef647fada6 [diff] |
Merge "Fix reentrant deadlock in GLSurfaceView."