diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-10-26 04:47:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-10-26 04:47:08 +0000 |
| commit | 9a3f63d7132f6504460a6d4d8f65b31e5fddb982 (patch) | |
| tree | e463a97a26aaecf30b007adc1d5201008896a187 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | cbe768575fb05031465a336d3c8af5ef18a1ddcd (diff) | |
| parent | 87e5a5e051987a54e5225980e069843f641bf616 (diff) | |
Merge changes from topic "am-6269d6c0d0bb413c84e5068d06041457"
* changes:
Merge "Add keys to retrieve color aspects from metadata" am: 6636b0227d am: a2ec9e32c6 am: 194a3a7587
Merge "Color aspects keys information stored database" am: e4c918ba8e am: 89c615866a am: e8c39f3ba0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions