diff options
| author | Geoff Mendal <mendal@google.com> | 2015-06-15 13:54:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-15 13:54:32 +0000 |
| commit | 26df364618da36007186df8eb4c7a85e47f8e18a (patch) | |
| tree | a5a29a2c921e5dae089aa9e97cfd8f20e808f43e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 49ab026a5298668681665212e0ea21f514e0642e (diff) | |
| parent | 1ed87e5d30b5ccfd1d7448f22389143928b8c118 (diff) | |
am 1ed87e5d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '1ed87e5d30b5ccfd1d7448f22389143928b8c118':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions