diff options
author | Daniel Nishi <dhnishi@google.com> | 2017-07-06 22:19:31 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-06 22:19:31 +0000 |
commit | 425955f7cab88411bd03063c1ceb743d8dd3414c (patch) | |
tree | 3ebfddae1ac3ab32e71c40c3cd9256884e89192d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 5836b5d29b3f97ea68f7c60fe4eab95584cd49ab (diff) | |
parent | 932f36050c65e7df1cf211ead3f57149fff357f2 (diff) |
Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev am: a48cf1e619
am: 932f36050c -s ours
Change-Id: I725fca68477839d764812689861ecfa4ae663bd9
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions