diff options
| author | Etan Cohen <etancohen@google.com> | 2016-10-05 22:32:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-05 22:32:09 +0000 |
| commit | aec4cfaf1f0ed45c5497f1ddfc13c007b03eb7e5 (patch) | |
| tree | 0052bfa3c4111867aa0484787c90e9d206fd3766 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6e9119640452250187d14d25304c5512c55797a8 (diff) | |
| parent | 78c2ee57f9ce615abc6c2c2c0991bbed106da6b6 (diff) | |
Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery [DO NOT MERGE]" into mm-wireless-dev
am: 78c2ee57f9 -s ours
Change-Id: Ic0a353bfd0e7cff20de69e29ca8ff43265c3b93b
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions