diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-28 20:51:38 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-28 20:51:38 +0000 |
commit | 9736e62fd0ccf5f079981d7ef62ba9b9e3d5bf31 (patch) | |
tree | 894cf5e88bb050cf3680ca11ebcd186e34f4952c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 5dd79ecacc78a6dfcd3cb60a0bfc28b557c322cb (diff) | |
parent | 1b2341bded7b99c113ebaa8bb0840cdf53da86a5 (diff) |
[automerger skipped] Merge "Allow module libs to use VINTF AIDL (part II)" am: 1054fd8e86 am: 3719bd9cd0 -s ours am: f73a22aa44 -s ours am: 1b2341bded -s ours
am skip reason: Change-Id Idc2acb28ac0475ee69385487c7ef619951f93516 with SHA-1 e5bd46e639 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373823
Change-Id: I140a94b10a31ba3a8593bae188ecdd9de6aae45e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions