diff options
| author | Bill Yi <byi@google.com> | 2019-05-22 06:29:19 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-22 06:29:19 -0700 |
| commit | bfb6a05d6ffaeddbdddb9928c8c8717be0941fad (patch) | |
| tree | 6b003e29fab65a82d119f995753c8fec467cf0cb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2690b00cffb7ff84c2f0dd157233654a98e4af87 (diff) | |
| parent | 091970a59200f0c7ce043566db63711c38ab57bb (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 033d7caf95 -s ours
am: 091970a592 -s ours
am skip reason: subject contains skip directive
Change-Id: Id4125a45bb82c995ea3a7e1b6befa6495f737b31
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions