diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-13 16:01:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 16:01:08 +0000 |
| commit | 97720a07a7d5350a2e5de4d1d96f5bd5cad8e596 (patch) | |
| tree | 933afff8eeb2b66569e41799e504e413ed0e0f11 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5396a5ce3bd64d12a7b43ebe2e445f347a9ed318 (diff) | |
| parent | 709c54588adf1c75a52e93e3ea19fc8b22d55260 (diff) | |
am 709c5458: (-s ours) am eb1ed80a: (-s ours) am 8a4717de: (-s ours) am 388d1cc8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '709c54588adf1c75a52e93e3ea19fc8b22d55260':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions