diff options
| author | Bill Yi <byi@google.com> | 2016-07-21 03:55:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-21 03:55:32 +0000 |
| commit | 2384fc541d3eac1d13d1869a6e165a185e4b6c4a (patch) | |
| tree | a2a4e4fe100910cb3a4848e17dd3d762588d4ebc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c49736e85b4eb26efcf5028fffd5379d50345e16 (diff) | |
| parent | 74d10c0b14507b23e0419d827a2ba96f348e5d88 (diff) | |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: dfb24a204f -s ours
am: 74d10c0b14 -s ours
Change-Id: Ie3500be37250170ac803e80de5cfaf2976967e22
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions