diff options
| author | Baligh Uddin <baligh@google.com> | 2016-05-22 23:50:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-22 23:50:32 +0000 |
| commit | 346193f779e2c535621eb6eb5da8f0f45ea336a9 (patch) | |
| tree | a9644bf1d5f1972ec4ce81b857b823560b500b2e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7465991eafeeaf2d32dea244734770e23b66c4c5 (diff) | |
| parent | 2696e0ad1ff59e9a21488db8a8faeda215861c50 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: a4bfd03cd5 -s ours am: 03797f0562 -s ours
am: 2696e0ad1f -s ours
* commit '2696e0ad1ff59e9a21488db8a8faeda215861c50':
Import translations. DO NOT MERGE
Change-Id: I8db21ffee5f9e01f2a41cc10b00099b7db3a8f0c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions