diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-22 14:31:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-22 14:31:50 +0000 |
| commit | 6722aed82941a9af573d67550dec0db50dffa1d3 (patch) | |
| tree | ea3a51a5eb52af1faf0e316af511f2b4a868e12d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8a17c86343e215056090cdd7caff977bcd205dc3 (diff) | |
| parent | 1ac9628c97a04dacfaaf4ebe5dbcfd6599b0405f (diff) | |
am 1ac9628c: (-s ours) am 8d5ed661: (-s ours) am 920e8be6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '1ac9628c97a04dacfaaf4ebe5dbcfd6599b0405f':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions