diff options
| author | Geoff Mendal <mendal@google.com> | 2015-10-21 17:38:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-21 17:38:33 +0000 |
| commit | df21f6bbc0f48ace2dabddcb13d0a3c96dce0694 (patch) | |
| tree | dc77f53e5b185a9b4b3cf5f35dbac281c754f200 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 72beb69d130fedf1b83184b10e168594b75af5ad (diff) | |
| parent | 9bf6d96370414d61f5924335ef48c97e71dd41df (diff) | |
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8ba1cdd946 -s ours am: 762ce0fc44 -s ours am: 96b250771e -s ours
am: 9bf6d96370 -s ours
* commit '9bf6d96370414d61f5924335ef48c97e71dd41df':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions