diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-01-29 20:43:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-29 20:43:49 +0000 |
| commit | f5682c033250eeb31a22f1a607c748a0f7707d13 (patch) | |
| tree | c434455f64cd2c980a74a148b2fc048cd24928ac /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a7026c2eca1fb2cb2e1230b2489ee0acc6372291 (diff) | |
| parent | 290cbce8e18825ab98bdc17dffd028482b509946 (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 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: If5eea1e2d925e7584cfa015ce3315b12dcc0c7cc
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions