diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-19 18:15:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 18:15:47 +0000 |
| commit | 77819378e561da0a12ec0a72420f760f9e9ef9ae (patch) | |
| tree | cd16f63e49e7e644433abd1c5ffd1c3a780bee73 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9237e246fdae4ab6654928da380b9ee042900330 (diff) | |
| parent | b22c59e2f60e96e7ff2166ea657963c35cf7f29c (diff) | |
am b22c59e2: (-s ours) am c488631e: (-s ours) am cbf24e12: (-s ours) am 2deb87d4: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'b22c59e2f60e96e7ff2166ea657963c35cf7f29c':
Import translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions