diff options
| author | Bill Yi <byi@google.com> | 2016-05-27 03:24:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-27 03:24:34 +0000 |
| commit | a308faaa66fbac44ad63d68d9cac511869f451b4 (patch) | |
| tree | a832c338df7368dc1095c8b41d91db709aad6990 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | baa7989dc20523af2078225eca1ee07f390827f6 (diff) | |
| parent | 9f2ffbcd6674928818775002f15a1661d322aef1 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 9aed8c2fa0 -s ours
am: 9f2ffbcd66 -s ours
* commit '9f2ffbcd6674928818775002f15a1661d322aef1':
Change-Id: Idaf84d41a7aac1ed04b0abf97ca0449b53afaf89
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions