diff options
| author | Geoff Mendal <mendal@google.com> | 2014-11-10 17:22:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-10 17:22:06 +0000 |
| commit | 46524961fa660fe757f952e431e5e92e74f5b69f (patch) | |
| tree | 3f51166d93562ba674fc682f238bc1e94becec26 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0f4c37a6cb9fa073570fcabe451c8d1d2a92a678 (diff) | |
| parent | deb466201ae333fe343d7aefb69366eea8dbc48a (diff) | |
am deb46620: (-s ours) am c0c9b129: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit 'deb466201ae333fe343d7aefb69366eea8dbc48a':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions