diff options
| author | Geoff Mendal <mendal@google.com> | 2015-08-03 16:43:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-03 16:43:20 +0000 |
| commit | d36380cc168bb2a7ed8827c7a89f78c9dcdb62b8 (patch) | |
| tree | 207007b64df7019f64c5c302d2709ea9dadc58e2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a9b4ed9ee65c3db1975defe1b6bb1afd91cd7ba6 (diff) | |
| parent | 7e1c227e26d76aefb98405defa11ff1e932cafca (diff) | |
am 7e1c227e: (-s ours) am 91ddd4ad: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '7e1c227e26d76aefb98405defa11ff1e932cafca':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions