diff options
author | Hongwei Wang <hwwang@google.com> | 2019-07-30 10:24:26 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-30 10:24:26 -0700 |
commit | 4d68b649791dfd495023b16624df01e03216427c (patch) | |
tree | 96db079cfad5649b247f77783f08d03ed3d765c7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | a110b6b9604f8ed93096fd569e4c9223e7f66630 (diff) | |
parent | 6e141ce1ed0e744bd9cb02a8fc6f988749fbed9c (diff) |
Merge "Allow resume of parent activity that launches PiP" into qt-r1-dev am: 2c89115cb7 am: d820cc2e7c
am: 6e141ce1ed
Change-Id: Ib7d224724a5c2bdf3248fa118167d2a34815fe90
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions