diff options
author | Geoff Mendal <mendal@google.com> | 2016-02-03 10:43:31 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-02-03 10:43:31 +0000 |
commit | c6c727f7a0e5b03a722455cb7c24073537acbab1 (patch) | |
tree | 78148f4ea7a01b1dc65fa2ac0114409cf1e48c62 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 3f33e344dd8cd60bc4e0e4c3ce6f27efda974c38 (diff) | |
parent | 381c7ce4ed857113d838743d7de224fab021e278 (diff) |
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 497300badb -s ours am: abaebda3ff -s ours
am: 381c7ce4ed -s ours
* commit '381c7ce4ed857113d838743d7de224fab021e278':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions