diff options
author | Winson Chiu <chiuwinson@google.com> | 2020-06-26 18:52:51 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-26 18:52:51 +0000 |
commit | 3aa01e4039743c449054a0e0a2c53d120e28b485 (patch) | |
tree | 77b7c1c3463806ac8559385a6ba953917de19552 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | a027d414cecd1f68dbaa3db79d9d6cbbda5900bc (diff) | |
parent | 34ed9dd3f04b0787c7a0853200c1ae8ac41e33f6 (diff) |
[automerger skipped] Merge "Revert "Ignores protected broadcasts if not priv-app"" into qt-qpr1-dev am: 2c2929bb22 -s ours am: 34ed9dd3f0 -s ours
am skip reason: Change-Id I54d236c0a6daaa934bd64a3bd05e2654e0e868fe with SHA-1 3e46d7e1a1 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886048
Change-Id: Ifacec180999039a31b6d53a1086d2d82a1f4108f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions