diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-07-06 22:52:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-07-06 22:52:32 +0000 |
| commit | 41d6995efa703c3bb2c6f3c69df2cb9194e3c783 (patch) | |
| tree | 76ecd5eed16bc8bd4f8130e60559efa486037c42 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4d08be4a528a3695ddcaf6a74e1b55ebe3e46d97 (diff) | |
| parent | b5836f44e463749d5d6c2b5dbe0f64148283898a (diff) | |
Merge changes from topic 'am-638c543cf14f446eae62e5f283001253' into stage-aosp-master
* changes:
Merge changes from topic 'NCI-2.0' am: 430dded515
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions