diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:35:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:35:59 +0000 |
| commit | 4f164636a7924697816ec50762890fff3377d574 (patch) | |
| tree | 2ccd3e5cd0a5778286a63bf9cbbde39dcf0d57eb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6c79212afda77801128d94cbf5863396cd2e91b4 (diff) | |
| parent | 68254909b326b91fd408f98fc80ed6114db7b078 (diff) | |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 52edfafb9c -s ours am: 7d627e9cf0 -s ours" into nyc-mr1-dev-plus-aosp
am: 68254909b3 -s ours
* commit '68254909b326b91fd408f98fc80ed6114db7b078':
Import translations. DO NOT MERGE
Change-Id: I1efc7c596d1eea858a18cd3bf1f46a49210a6954
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions