diff options
| author | Geoff Mendal <mendal@google.com> | 2014-11-10 17:37:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-10 17:37:02 +0000 |
| commit | ccfbd1bacc3c0ab5525b2cfd695ad225468a338e (patch) | |
| tree | 9291ee72aa494526432c8c5dbb4cb133cc5dff87 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f805988770761e2446436d4e5fac58b3e95faac5 (diff) | |
| parent | 20083734d92eb893c36278d2486404eedc0cc1f9 (diff) | |
am 20083734: (-s ours) am 8f02ec4f: (-s ours) am d53436a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '20083734d92eb893c36278d2486404eedc0cc1f9':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions