diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:22:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:22:17 +0000 |
| commit | 53581625ea31718bcdb42171265ef796536cf14b (patch) | |
| tree | 2ccd3e5cd0a5778286a63bf9cbbde39dcf0d57eb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1113318561344fb94ab004d082d36697fff7d5f4 (diff) | |
| parent | 650a2aad33720c0270593003c2e4078ba6d49feb (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 3d9d9fa0d9 -s ours am: 67ae5a2251 -s ours
am: 650a2aad33 -s ours
* commit '650a2aad33720c0270593003c2e4078ba6d49feb':
Import translations. DO NOT MERGE
Change-Id: I083ba2ea89946cde9a58e26fbb48d91820c6c4f4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions