diff options
| author | Geoff Mendal <mendal@google.com> | 2014-11-19 15:28:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-19 15:28:42 +0000 |
| commit | 49a93f520fc505df61713b3323e9da9e7559c7d0 (patch) | |
| tree | 997e0707c449153b8e36801c309bf758dc4a6d11 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4854657f0eaeef4c51b51976561eafd403bc5353 (diff) | |
| parent | 0014addf883675613648713e7c01b70fb780a5dc (diff) | |
am 0014addf: (-s ours) am 04b6a6d3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '0014addf883675613648713e7c01b70fb780a5dc':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions