diff options
author | Ivan Podogov <ginkage@google.com> | 2016-12-29 11:16:50 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-12-29 11:16:50 +0000 |
commit | 04a20f695d8ddfa237e505402f9a297bff76fc41 (patch) | |
tree | 1fae19bbd9d0f06b785483ab706a55059ebf593a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | c052e6c67f57907d7eaa68176ab388cbc5653b8a (diff) | |
parent | b90fa0a5c368e8a71aacfdb7cada5a169b2c901d (diff) |
Merge "In permission review mode, always request user's consent to toggle BT." am: 895e2d7a40 -s ours am: fd770e1cb8
am: b90fa0a5c3
Change-Id: Id527fe8b5242ae6650446ce2993708463c08323b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions