diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:22:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:22:12 +0000 |
| commit | 1113318561344fb94ab004d082d36697fff7d5f4 (patch) | |
| tree | 2ccd3e5cd0a5778286a63bf9cbbde39dcf0d57eb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a8847be329f2552b451a87ab91758ebd1cd969c0 (diff) | |
| parent | 83680a1c3dc8aad2f7990279a1bf951cce215c5c (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: cace07e727 -s ours am: 479f70c516 -s ours
am: 83680a1c3d -s ours
* commit '83680a1c3dc8aad2f7990279a1bf951cce215c5c':
Import translations. DO NOT MERGE
Change-Id: Ie132b042de25fddc7f88a44ec1c5921c4e6bca7c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions