diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-03-23 20:26:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-23 20:26:24 +0000 |
| commit | c3d7200b6aad765e854737b221c6c74547701893 (patch) | |
| tree | 9bb8b4492da607f97b01f82576565fa2abb4c6be /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 87500a84a44310d024d7145609f154d6fb969171 (diff) | |
| parent | 7a9c03e529da5f484ca863d5e0ae1cdca3dabe7d (diff) | |
[automerger skipped] Merge "Parcel only the canonical Uri.Part representation, not both." into qt-qpr1-dev am: 7a9c03e529 -s ours
am skip reason: Change-Id I2bc2008e49de5a66641ecdbd8e5354dfa647269d with SHA-1 c9afa38f97 is in history
Change-Id: I7a7b61af41419bd722b055af2e3b41f673c17992
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions