diff options
| author | Miranda Kephart <mkephart@google.com> | 2020-11-09 23:47:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:47:43 +0000 |
| commit | 6a98a185213e949d91d72b9978dd387526f5ef15 (patch) | |
| tree | c0c1434efac7994e39152c293e0ac65ab075af9d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | dc2ccbaa9a3bf9a8b2d911bc47b44fbd43786a0a (diff) | |
| parent | ddd49dce06d7ce7a00cbfb785cd7cac66181ff43 (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into qt-dev am: b968a16db7 am: 2a84aae3ce -s ours am: 4e7a7d3cd3 am: a26090c1ae am: 994c010256 am: ddd49dce06 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773073
Change-Id: I13c5ea33df5c9fff70b3f435303233a04e6692a0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions