diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-13 15:42:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 15:42:51 +0000 |
| commit | 7458493e55fc2c04332dcfe5824c4111adf41ebf (patch) | |
| tree | 8c0a94d8a885ad9b7b94e415564beaab6cfe0af3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 709c54588adf1c75a52e93e3ea19fc8b22d55260 (diff) | |
| parent | 584e10e143334188c506b5e364da85d4c0051140 (diff) | |
am 584e10e1: (-s ours) am 9bee6f1a: (-s ours) am 7ff74826: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '584e10e143334188c506b5e364da85d4c0051140':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions