diff options
| author | Bill Yi <byi@google.com> | 2016-05-31 04:54:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-31 04:54:34 +0000 |
| commit | 8072b2cf9baf0da746551575c968c3b3a023a542 (patch) | |
| tree | d7f31fa72d5e6ecdb54af0228075f98b207c1ad3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9bd9985451e886a183ff8525cff4bc71c1ba4a67 (diff) | |
| parent | 5424a1be12c13087e4ceffd39d66254e06c2436e (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 6d160e9b8d -s ours
am: 5424a1be12 -s ours
* commit '5424a1be12c13087e4ceffd39d66254e06c2436e':
Import translations. DO NOT MERGE
Change-Id: Idfcd9e4d516ac5fb7a6ed2491eb1548da0b0fefa
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions