diff options
author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-07-06 22:59:15 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-07-06 22:59:15 +0000 |
commit | 3462f031444164bd061596db8f124cebdbd22adb (patch) | |
tree | eaaf40f65c265addde915b01fc0cf40b00a82db8 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 67d32575196d2221797d4882628c5c12cc19a6aa (diff) | |
parent | 1eea40dd30b50dcfbf05b81d51b419f18c657c1c (diff) |
Merge changes from topic 'am-0fe9238e031841a8802281f7e75ee086' into oc-dev-plus-aosp
* changes:
Merge changes from topic 'NCI-2.0' am: 430dded515 am: 4d08be4a52
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11 am: 93d313b0a0
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions