diff options
| author | Geoff Mendal <mendal@google.com> | 2015-08-06 04:29:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-06 04:29:54 +0000 |
| commit | 511cf5b88230910bac312f160e289650da896253 (patch) | |
| tree | 599f8c32fe584d24d5ab74aead9b94ff1a8d29ec /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | e69acd7a456fb97d7c816629dedb42026eabdd2e (diff) | |
| parent | 227d704f64cb7783b8626770ddbbfb151c843f99 (diff) | |
am 227d704f: (-s ours) am 375c792c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '227d704f64cb7783b8626770ddbbfb151c843f99':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions