diff options
| author | Geoff Mendal <mendal@google.com> | 2015-01-13 20:14:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-13 20:14:58 +0000 |
| commit | 16fb7a3cfeabfdfa56370d93295cc80bdc188d77 (patch) | |
| tree | f20e8a01542eee31b51c60d8646ff55807df0421 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | cba9873ee23990ed98b3a890389c40427992bbd7 (diff) | |
| parent | 60d791c8640b30331ee710551e5fdc642fb432ff (diff) | |
am 3d9875f4: (-s ours) Import translations. DO NOT MERGE automerge: 83c2c04 -s ours
automerge: 60d791c -s ours
* commit '60d791c8640b30331ee710551e5fdc642fb432ff':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions