diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-01-29 21:45:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-29 21:45:39 +0000 |
| commit | d7f3c5b28182b269da9dbfe5f0ce2727ff24a170 (patch) | |
| tree | 6b17acab24e5f95d68f5a1f6d64da09b1688fc7e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2cb9fb226191678f11c9f7477dacf15a2075824f (diff) | |
| parent | 7316c1a1610ee8e8797c647eef3b0a131daaa91c (diff) | |
[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into oc-mr1-dev am: f4a729180c -s ours am: df0b2e9939 am: a4e5fdf10a am: 06885a559e -s ours am: 290cbce8e1 -s ours am: eb66da7a9d -s ours am: 7316c1a161 -s ours
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 eb8d0c749d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307593
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I88ddb940c400cc2edfd3078101f6318c3543e561
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions