diff options
author | Geoff Mendal <mendal@google.com> | 2016-02-03 10:37:51 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-02-03 10:37:51 +0000 |
commit | c901e0ceaa37d745b0984dd84da1931d25feec60 (patch) | |
tree | 78148f4ea7a01b1dc65fa2ac0114409cf1e48c62 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | e578f454c63794ae3203a936c48a40bb209302c1 (diff) | |
parent | 854926febbc7f78a161adc21db6dd4996d34aa7d (diff) |
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 26b12b719d -s ours am: c2ca962f06 -s ours
am: 854926febb -s ours
* commit '854926febbc7f78a161adc21db6dd4996d34aa7d':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions