diff options
| author | Nick Vaccaro <nvaccaro@google.com> | 2016-01-26 20:17:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-26 20:17:31 +0000 |
| commit | 972e9479a700d9d80aca7c036ed96ce6db4e78e5 (patch) | |
| tree | 6a4687b228f7caa9bd115e08802fa0544bf25114 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c7481250259144c2f7795408ad971f4a9319d996 (diff) | |
| parent | a0a1599d8b8d8da38a47a939864d6f80bf6b9a09 (diff) | |
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev am: ca19b6a4d3 -s ours
am: a0a1599d8b -s ours
* commit 'a0a1599d8b8d8da38a47a939864d6f80bf6b9a09':
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions