diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:33:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:33:36 +0000 |
| commit | b6869f823e4183c3e744cf3b7b8ac771099b6fcf (patch) | |
| tree | 2ccd3e5cd0a5778286a63bf9cbbde39dcf0d57eb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c8f08fd7f7036a94923704211314276bd3a031b4 (diff) | |
| parent | 2ac7d7f022556c84d206520c3e7221cc6824ffcb (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 7d84e110cb -s ours
am: 2ac7d7f022 -s ours
* commit '2ac7d7f022556c84d206520c3e7221cc6824ffcb':
Import translations. DO NOT MERGE
Change-Id: I5186dd983d6146b1427b6fd8323a46d6505beb30
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions