diff options
| author | Baligh Uddin <baligh@google.com> | 2016-05-22 23:32:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-22 23:32:22 +0000 |
| commit | e235b490de7d0102bae20938bbc3de838d97a969 (patch) | |
| tree | 37ef0dfb7ead444994fd79f60977c71bbaa9ce96 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 00725f1d65c2db7ee5eda48c5dc683bcfcf885ce (diff) | |
| parent | a4bfd03cd53aeac1c608fde7faa1f2c5a043a6ce (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: a4bfd03cd5 -s ours
* commit 'a4bfd03cd53aeac1c608fde7faa1f2c5a043a6ce':
Import translations. DO NOT MERGE
Change-Id: I2bba6312b1aa23a3768fb2a72529ac0d9351cb12
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions