diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-03-22 09:30:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-22 09:30:51 +0000 |
| commit | 3636a57caa666d2668977f12cae1fe02c2d3ffca (patch) | |
| tree | 7d60ea808c1645ed6fba03266d5c76ca7c9e67dc /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 00adccd4f10ea85df9bb4f6b6a951d71ec54396c (diff) | |
| parent | 7bf56f7e25623f3ec342bcec3903b58ba6d5d6f1 (diff) | |
[automerger skipped] Merge "Add BLUETOOTH_PRIVILEGED permission as a requirement for all new Bluetooth SystemApis and for hidden connect/disconnect APIs." am: c1cae420a2 am: 123b8d34b7 -s ours am: 17eb43f496 -s ours am: 7bf56f7e25 -s ours
am skip reason: Change-Id I33ee2c7ccd3827db3d23d6447cf82d9ffc36836a with SHA-1 2c71d16ced is in history
Change-Id: I5ca8e77f3d54058324f1c7e02f44d725b59977f6
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions