diff options
| author | Geoff Mendal <mendal@google.com> | 2015-01-13 20:26:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-13 20:26:39 +0000 |
| commit | 73ffaeb2af6f17c3266e62b081ba1bc1bf699f9f (patch) | |
| tree | db98182319e9a1f84b0669071e6fca4da47ab1e9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1ff978a2390569d2892f93fb144d04b5252c21b9 (diff) | |
| parent | eb99c8260252a90ff329f834b3b18088236d53f2 (diff) | |
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: 8858db6 -s ours
automerge: eb99c82 -s ours
* commit 'eb99c8260252a90ff329f834b3b18088236d53f2':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions