diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:23:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:23:35 +0000 |
| commit | 2ac7d7f022556c84d206520c3e7221cc6824ffcb (patch) | |
| tree | 8d7e5311c0b596c5abecd47fa8c19d9f757cfdb1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a27dbcb4a9d7ff8be8ac28016a25ee4bea8a4fa5 (diff) | |
| parent | 7d84e110cb7a6012a7cebb40a41198b36d129446 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 7d84e110cb -s ours
* commit '7d84e110cb7a6012a7cebb40a41198b36d129446':
Import translations. DO NOT MERGE
Change-Id: I562c0bc2db023fe46e04dfccac0588a84b4067ba
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions