diff options
author | Bill Yi <byi@google.com> | 2019-05-22 01:26:49 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-22 01:26:49 -0700 |
commit | 48f3647772b984c36fc26943e815b01f269b006f (patch) | |
tree | d5080547dc601f59284f816af7117e09c719d9a3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | e5c7029b4cb63bbd8e890b03dfbd6d22fc3a9eaa (diff) | |
parent | e2529357e81269fbee937dee0767f77dc11b6ce8 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: e2529357e8 -s ours
am skip reason: subject contains skip directive
Change-Id: I47a790cc20e24c32be171b9d090ac2d9c8906ae8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions