diff options
| author | Baligh Uddin <baligh@google.com> | 2014-09-21 18:02:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-21 18:02:10 +0000 |
| commit | a7c206856c3582d4d713fa834e92751b5d1fbfa8 (patch) | |
| tree | 195f84514b10a505d6472e8b1d6f0d61929195ca /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e5a94bbdaa3c72a352d5bf42f932e5a4c39d44e6 (diff) | |
| parent | 43c9e64b9a0920d9cdfb7c0c53324a644559d644 (diff) | |
am 5ed716c1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '5ed716c1f4a4ae0ec9c8ec787b56cf6596b1020d':
Import translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions