diff options
| author | Geoff Mendal <mendal@google.com> | 2015-02-12 23:05:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-12 23:05:23 +0000 |
| commit | cd15d99721b514d6b104302217805ded5e194e43 (patch) | |
| tree | ce7cec99f0dd32e67464e93a42927f9da159c155 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 682cec120ee73d8e831e4d04c478712dc408cf02 (diff) | |
| parent | dfe8fe3fcf551386d6107b67bc348d88207979c3 (diff) | |
am dfe8fe3f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit 'dfe8fe3fcf551386d6107b67bc348d88207979c3':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions