diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-07-12 19:26:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-07-12 19:26:31 +0000 |
| commit | 31597b6253bff8407986f69dd2d84cf3ab0ddb8c (patch) | |
| tree | e946a9c5627aac72be1273b96e18ec8738a0ca27 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e97378c65711a17df1a19b95bc0e442b768a8914 (diff) | |
| parent | 741c97faa9a50d5767caceb77933434caa7228bd (diff) | |
Merge changes from topic "am-9f47cb6c-9cea-4b25-9f9b-e0e460e471ac" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: f4037fb69e
Import translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions