diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-27 14:42:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-27 14:42:45 +0000 |
| commit | 4e3f444adfea44aac582f587aa3fd9d703f52c89 (patch) | |
| tree | 6f87a6511c79149f72d4804c468a9f24e93e553a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 38910d18e0b702eea67a4481dfa984cac01a0efc (diff) | |
| parent | 924319c2e5bd09a95685ef10bb2eb8b15ad07e58 (diff) | |
am 924319c2: (-s ours) am 85518411: (-s ours) am 3a5edd9f: (-s ours) am 4cd6da53: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '924319c2e5bd09a95685ef10bb2eb8b15ad07e58':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions