diff options
| author | Geoff Mendal <mendal@google.com> | 2014-12-04 21:45:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-04 21:45:55 +0000 |
| commit | 72142eb12a6c5362126d0d8a4060c4c90dc30766 (patch) | |
| tree | 2553787d980c2e5a6efee30f3419a053245a2eb0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9088853d708b3cbca3e5dab69fea603be8eb0d83 (diff) | |
| parent | c7d8a48bb01f3d6ffbf6a3f8f81e23dd0b806562 (diff) | |
am c7d8a48b: (-s ours) am cc7c68b5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'c7d8a48bb01f3d6ffbf6a3f8f81e23dd0b806562':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions