diff options
| author | Bill Yi <byi@google.com> | 2016-06-01 15:58:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-01 15:58:40 +0000 |
| commit | a6cef60067e5b553eedc0b4e4feb4ee7d0138d6f (patch) | |
| tree | 169006be14655a8c28a35a77715f4d2c9c5af16b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c77280528d62c321151485641e2fa16fb8449286 (diff) | |
| parent | db565bd5164c75184588d82f6f16b48715eb4cd3 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: a007e877f2 -s ours am: 652af4f813 -s ours
am: db565bd516 -s ours
* commit 'db565bd5164c75184588d82f6f16b48715eb4cd3':
Import translations. DO NOT MERGE
Change-Id: I219e46e4ec657af17fddd3dc0633f2a45757f014
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions
