diff options
| author | Bill Yi <byi@google.com> | 2016-07-25 17:18:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-25 17:18:23 +0000 |
| commit | eac26d030043b20164bc5ede1176f499bac12d5b (patch) | |
| tree | fa40b5a269c128bbb31da8784fd7cbd6663ff1df /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5b35ded312b8a10fada459d76447444ef9e96149 (diff) | |
| parent | b661920d7b5bfffeb63049dd29933fd40a4d856f (diff) | |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 0f840998b1 -s ours
am: b661920d7b -s ours
Change-Id: I2f421ed16509260db268f5b2d78a4b67caf14d06
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions