diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-29 14:29:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 14:29:40 +0000 |
| commit | d8527c421ab79a009bd917cd4e401c083dc55181 (patch) | |
| tree | a2f1b476ca9393b5a583e65f9878893c41e6cb0c /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 32ceb174c615591a7fe5fd847da6156d29fa6472 (diff) | |
| parent | 07d6c197a5bcfc8122cfbeba48330d1ad178b535 (diff) | |
am 07d6c197: (-s ours) am 7a66d847: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '07d6c197a5bcfc8122cfbeba48330d1ad178b535':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions