diff options
| author | Baligh Uddin <baligh@google.com> | 2016-05-22 23:53:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-22 23:53:22 +0000 |
| commit | 061aafcd764aa7131e812e9531b10d8116cc31dd (patch) | |
| tree | a9644bf1d5f1972ec4ce81b857b823560b500b2e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ec8e6395fd7a7c603a2baf09fdde55a4bb0f05d3 (diff) | |
| parent | f381dad9fc221adb00d5a93ef02c5b557da44712 (diff) | |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 23b665d65c -s ours am: 8525e50530 -s ours" into nyc-mr1-dev-plus-aosp
am: f381dad9fc -s ours
* commit 'f381dad9fc221adb00d5a93ef02c5b557da44712':
Import translations. DO NOT MERGE
Change-Id: I860169f4c61856303448ab00478b6de78188f90f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions