diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-10-06 21:43:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-10-06 21:43:56 +0000 |
| commit | 11f8c5381a6717222bd61325758fe65e66c5e81f (patch) | |
| tree | ba643bedd3074815a0b8449572ff3e0ee83afce0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0c327cfc0de00cf138a6724090641ae23df0f102 (diff) | |
| parent | 2d2d335631fae6bbed0bd05d8aec5554e003d59d (diff) | |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 5e6fb1699f -s ours am: dcc4542c05 -s ours" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions