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