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