diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-22 14:31:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-22 14:31:45 +0000 |
| commit | 8a17c86343e215056090cdd7caff977bcd205dc3 (patch) | |
| tree | ea3a51a5eb52af1faf0e316af511f2b4a868e12d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1ddf059e6d5a601e12d75e1cf2913ef24cac2bb8 (diff) | |
| parent | 5cae0cded77f412d738bfdc2e58036c8e9422135 (diff) | |
am 5cae0cde: (-s ours) am a88427c3: (-s ours) am e573ee63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '5cae0cded77f412d738bfdc2e58036c8e9422135':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions