diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-15 22:45:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-15 22:45:57 +0000 |
| commit | 40e3b4b5c10dbde39486a30bf37d13bf1464dfa5 (patch) | |
| tree | 42aca450c8ea2ad42ef468b1b07dc1a19e4d949b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c71f3a2d4a3b3ab52be08e68646ffcb71b55066a (diff) | |
| parent | 76b8b1e663553ecf92d669c02747692233545584 (diff) | |
am 76b8b1e6: (-s ours) am 78b6e6c7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '76b8b1e663553ecf92d669c02747692233545584':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions