diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-19 18:17:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 18:17:33 +0000 |
| commit | 0eec4e7b2d6d38c316f8df211f71ea37a823c446 (patch) | |
| tree | cd16f63e49e7e644433abd1c5ffd1c3a780bee73 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3b020019dd10f0a5124845f55bdff4d3a99378d7 (diff) | |
| parent | 544a2885838e38f4465d768c180b5d71ce5ff0ee (diff) | |
am 544a2885: (-s ours) am 54368ed0: (-s ours) am 560a1551: (-s ours) am 78ef803f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '544a2885838e38f4465d768c180b5d71ce5ff0ee':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions