diff options
author | Bill Yi <byi@google.com> | 2017-06-22 13:35:55 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-06-22 13:35:55 +0000 |
commit | 70c2a7b0d99e14a4760bea6522a1f30055ae3b91 (patch) | |
tree | a6868088f7478ba4ab07d5f5741d659ea9fc09b5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | ca35ed5cb9891c8a9ccc3d2c8f72431d0c112c5c (diff) | |
parent | 242c3c497c3b79be844713cbe7280f19ddd9f711 (diff) |
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 242c3c497c -s ours
Change-Id: Idbb294776a7400de5aebb99b9a45f7121c7415f6
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions