diff options
| author | Chris Wren <cwren@android.com> | 2017-05-12 01:49:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-05-12 01:49:06 +0000 |
| commit | 69ab8e1d56dddb73296eb2f8659affd94ba9ac1c (patch) | |
| tree | 2d110815961e929f42af5431996a44f17ff6ed60 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a8fe24446608b4498a73753593a070db9b7a4ffb (diff) | |
| parent | 89aa2261903fd09b08a2210a7a1b35d329f8330a (diff) | |
Merge changes from topic 'b/36021111' into oc-dev
* changes:
add a global control for badging
extend TestableSettingsProvider to multiuser
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions