diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-01-29 23:12:32 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-29 23:12:32 +0000 |
commit | 437ba0550b8f11649e99a9bbc70aeb69b3650678 (patch) | |
tree | d6564658ee827362556626200a5eccc668c80e25 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | d1fac34c3839b7c9fd4e89e50846a8cd7b834f36 (diff) | |
parent | c261534d1081a3abb258178f9ddd9745aef3147b (diff) |
[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into pi-dev am: 47fb5ee20c -s ours am: 589f538708 -s ours am: 06985dae13 -s ours am: a297374f96 -s ours am: 4186f7df67 -s ours am: c261534d10 -s ours
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 5a90c4c75b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307947
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4c761b5c336e73efc08ce78f8b1f1fa152904ee8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions