diff options
author | Zhijun He <zhijunhe@google.com> | 2017-06-19 05:04:29 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-06-19 05:04:29 +0000 |
commit | 71e07faafbf04d7c09e38873db937b13fc976c34 (patch) | |
tree | 27a6199dcc60f1d2b6c8ead3a46d9d7d680e9dd1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 008bc4f265b80d14d7efb5814b508981aae9612e (diff) | |
parent | a34c04d5c3323182d882dad52e3774771ae75683 (diff) |
Merge "Camera2: copy user tag to HFR request list" into oc-dr1-dev
am: a34c04d5c3
Change-Id: Ie7fbfc6948f19c36a487defffa4ca0a10e8eae66
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions