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