diff options
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-05-22 08:26:40 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-22 08:26:40 +0000 |
commit | 091970a59200f0c7ce043566db63711c38ab57bb (patch) | |
tree | 3111ac2d610fbc9d8644888cacb520a35c3cccc3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 61ad9b3a308e4bd675310eb0623129a966858633 (diff) | |
parent | e5c7029b4cb63bbd8e890b03dfbd6d22fc3a9eaa (diff) |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 033d7caf95 -s ours am skip reason: subject contains skip directive" into qt-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions