diff options
| author | Adam He <adamhe@google.com> | 2019-01-29 22:46:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-01-29 22:46:24 +0000 |
| commit | b278ec38369e351c456b8459e4fa93d03e73f623 (patch) | |
| tree | 42309adad875c88a3ce231caae0c33bdec313101 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 0f878e30bb5d3762a801c34995f067c9e90bc4e8 (diff) | |
| parent | bb0c2a2a330c9903fbb3badc55d9a8ded3bc3299 (diff) | |
Merge changes from topics "dsiable_settings_2", "disable_cc_settings"
* changes:
Added new APIs to let ContentCaptureService enable / disable the feature.
Added new APIs to let Settings enable / disable ContentCapture
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions