diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-08 14:47:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-08 14:47:53 +0000 |
| commit | cb1486d0fa703866c29d11872588215259e819fd (patch) | |
| tree | a74e61178bba7a80142a5d65774340c28363c153 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 12ceccaf7aa4198bb578bcba844729c0ac146d6d (diff) | |
| parent | 1fee49529e6310a2fc163f004e5f5299d006cb2f (diff) | |
am 1fee4952: (-s ours) am 1e9b3cff: (-s ours) am 18d4eaf5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '1fee49529e6310a2fc163f004e5f5299d006cb2f':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions