diff options
| author | Bill Yi <byi@google.com> | 2016-07-01 05:11:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-01 05:11:00 +0000 |
| commit | 717a49250e561f258a6d51be816c7d7661cc1ffe (patch) | |
| tree | 718f9de5999d4d5756d3a5b698802fdd9b3909c8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a56683cda2c294f8c9ea588038c9d66dde1fd0c5 (diff) | |
| parent | 273eac9b755f884b88afa8b7af516818f74f4247 (diff) | |
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: baedc65a8b -s ours
am: 273eac9b75 -s ours
Change-Id: I8dd4427627c41546e1fdb36cbfff2db7798766c7
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions