diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:36:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:36:01 +0000 |
| commit | 1e6abe0a940650a7d30800106c6bbaec654e7e90 (patch) | |
| tree | 2ccd3e5cd0a5778286a63bf9cbbde39dcf0d57eb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4f164636a7924697816ec50762890fff3377d574 (diff) | |
| parent | 70f0bb3937af9355a9aafcabc191b8991fae8ad2 (diff) | |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 31cd8615b2 -s ours am: 498f780f42 -s ours" into nyc-mr1-dev-plus-aosp
am: 70f0bb3937 -s ours
* commit '70f0bb3937af9355a9aafcabc191b8991fae8ad2':
Import translations. DO NOT MERGE
Change-Id: I6480fbbba287e92139a366d8b7cd113558153e42
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions