diff options
| author | Baligh Uddin <baligh@google.com> | 2014-12-03 00:30:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-03 00:30:30 +0000 |
| commit | fa2b3c24c7ef08d7ba72a3fdbc8cb1a1b56f0e6d (patch) | |
| tree | 1b501424ea3228ec785ee53fa5c74db2b4f9623a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 12cadd4daf3c3646127663d7d709f03a7e5aeeaf (diff) | |
| parent | 52632ad881c96e785518e18fde1a72e6f6e25a42 (diff) | |
am 52632ad8: (-s ours) am 74724945: (-s ours) am fccaa58c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '52632ad881c96e785518e18fde1a72e6f6e25a42':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions