diff options
| author | Geoff Mendal <mendal@google.com> | 2015-02-12 23:09:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-12 23:09:01 +0000 |
| commit | 028e986c4cd55b7877f2450f6e6c774b821a0a31 (patch) | |
| tree | 4248c8f80362950eb2ca911c7576bad5e1255be5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 09247179cba6cb027388cee361291b3ac4a547a7 (diff) | |
| parent | 14720e7a38e8eccf289de6a6da7ea42c41d87a04 (diff) | |
am 6113edf5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
automerge: 14720e7 -s ours
* commit '14720e7a38e8eccf289de6a6da7ea42c41d87a04':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions