diff options
author | Bill Yi <byi@google.com> | 2017-06-27 20:12:54 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-06-27 20:12:54 +0000 |
commit | b07d9720119d6726aa0237cd99ba58316cc262df (patch) | |
tree | 82f93790407f55dd3e2c6556766069837fe8c0bc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 00d60d3076d7b342d0cdb4f0406d03724a604572 (diff) | |
parent | 8d16bcef26513fe5ab3b243455dbcd98ea4f4e3a (diff) |
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 8d16bcef26 -s ours
Change-Id: I2282f0ab89638dce50ed3c6b3ad66604bfe4c1ee
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions