diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:22:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:22:20 +0000 |
| commit | 20be97563f541dd6e07595f782a3a1da58ba86f4 (patch) | |
| tree | 2ccd3e5cd0a5778286a63bf9cbbde39dcf0d57eb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 53581625ea31718bcdb42171265ef796536cf14b (diff) | |
| parent | 2e03e4651ac37564da484ae44e52be7b16aa0e96 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: ef2989920d -s ours am: f089201e2e -s ours
am: 2e03e4651a -s ours
* commit '2e03e4651ac37564da484ae44e52be7b16aa0e96':
Import translations. DO NOT MERGE
Change-Id: I0a362e73647cb372fc76961e6d872c95840c739c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions
