diff options
| author | Geoff Mendal <mendal@google.com> | 2015-06-15 16:50:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-15 16:50:07 +0000 |
| commit | 9f64e5dbff8c12c41f4a3bc9d9fca4d6968e2d4e (patch) | |
| tree | bb8be1d496a8823b9356351a5d142eb51bb69c44 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 52efe6ee48e3f323304155c18a1f7cd0af9369d0 (diff) | |
| parent | b00901793e4b6f1bccaa2737972e0aba5129365b (diff) | |
am b0090179: (-s ours) am 316548e3: (-s ours) am 40f7418d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'b00901793e4b6f1bccaa2737972e0aba5129365b':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions