diff options
| author | Neil Fuller <nfuller@google.com> | 2017-08-12 04:08:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-12 04:08:21 +0000 |
| commit | eae614033eac0580cd002ea415e1d071c0129b80 (patch) | |
| tree | fe4f753ad7196d3ceea37cc90bc5c273910cc54b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f00a9c999df30fb9eb05ad2a6b6106a061ccebed (diff) | |
| parent | a19580fd71e197bf7ab9b1375372a52a3aae2810 (diff) | |
Merge "Move DISABLE_INPUT_DEVICE permission" into oc-dr1-dev am: a031b0d6a1 -s ours
am: a19580fd71 -s ours
Change-Id: I8cee159484faf9f30205dcde0f0b527d3bf620e6
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions