diff options
| author | Geoff Mendal <mendal@google.com> | 2015-06-15 14:09:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-15 14:09:04 +0000 |
| commit | ea1807aa9d6829e4b8c07b82a349d1f15d37a503 (patch) | |
| tree | a5a29a2c921e5dae089aa9e97cfd8f20e808f43e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f2cd168186d6e96a345b7d6cd54e312f5536a1e0 (diff) | |
| parent | 991f0f6549fd25a658f2519b4ee2169c6c5195eb (diff) | |
am 991f0f65: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '991f0f6549fd25a658f2519b4ee2169c6c5195eb':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions