diff options
author | Bill Yi <byi@google.com> | 2016-12-22 08:08:08 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-12-22 08:08:08 +0000 |
commit | 64a1060855f57bb6beb4bed56a3722b3bd484a5d (patch) | |
tree | c5532fee0cacbd83abb9f9c7ff60b0f574dc75d0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 8d8b116bfdb68db1fd6519fcafed0359538beb70 (diff) | |
parent | 45c9ba9c1582d65dc083097ad73e23d8f88ecc58 (diff) |
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 45c9ba9c15 -s ours
Change-Id: I55a93590829178eaabf1899be1a740c763676c24
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions