diff options
| author | Bill Yi <byi@google.com> | 2016-07-01 05:10:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-01 05:10:58 +0000 |
| commit | a56683cda2c294f8c9ea588038c9d66dde1fd0c5 (patch) | |
| tree | 718f9de5999d4d5756d3a5b698802fdd9b3909c8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 33eb0e2d33896d6a6b82574e06d66c37d9da4c8a (diff) | |
| parent | 324990b5e329d0530da41a6c433d58d5424c5510 (diff) | |
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 914376787b -s ours
am: 324990b5e3 -s ours
Change-Id: Icc0fb526666ab153a18521d6d376914c61636328
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions