diff options
| author | Bill Yi <byi@google.com> | 2016-08-04 09:27:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-08-04 09:27:49 +0000 |
| commit | 968e1d93f828e6f2ed12713f84e5eac7b46fc3e4 (patch) | |
| tree | cd849af3a6bb6665af0265f20dde9e0a2fc5f370 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 692968828c5109614e838aa2365fab0b0c113b88 (diff) | |
| parent | 85c61142ab084ebc1dc32887318cc8865da93751 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 85c61142ab -s ours
Change-Id: I007993430ab0258ab6ade39a7c2f8e5705f526f8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions