diff options
| author | Baligh Uddin <baligh@google.com> | 2014-09-29 20:48:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-29 20:48:34 +0000 |
| commit | f94a7f804ccadd60058617b86208d77345184da2 (patch) | |
| tree | f3f90285d503a02b3f347f0c461738020c033152 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a2aec5d7d2b76ebe6f9ab49f7bb876e0530d87a6 (diff) | |
| parent | 5ce474d71e6104095dfcdce56fac56eedbf41199 (diff) | |
am 5ce474d7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '5ce474d71e6104095dfcdce56fac56eedbf41199':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions