diff options
| author | Geoff Mendal <mendal@google.com> | 2016-02-03 12:03:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-03 12:03:36 +0000 |
| commit | e19db0fe70f06f587c4855db44bb08f578da0b81 (patch) | |
| tree | 78148f4ea7a01b1dc65fa2ac0114409cf1e48c62 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2eeb297469f8f42e2bf05bd6b989550ed1957607 (diff) | |
| parent | 0ba5990d99fe96e5c6c1b864c4a23899be8b258a (diff) | |
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 38f33925f8 -s ours
am: 0ba5990d99 -s ours
* commit '0ba5990d99fe96e5c6c1b864c4a23899be8b258a':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions