diff options
author | Winson Chiu <chiuwinson@google.com> | 2020-06-26 19:10:58 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-26 19:10:58 +0000 |
commit | 8cd4094d2ecc145ba81bb3b0ac35248bf3207713 (patch) | |
tree | 77b7c1c3463806ac8559385a6ba953917de19552 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 3aa01e4039743c449054a0e0a2c53d120e28b485 (diff) | |
parent | b6670ad8ec7bf6edd9c1f20d358aae9dddbcb10b (diff) |
[automerger skipped] Merge "Revert "Ignores protected broadcasts if not priv-app"" into qt-dev am: f63adb20f6 -s ours am: 4376a307fc -s ours am: b6670ad8ec -s ours
am skip reason: Change-Id I54d236c0a6daaa934bd64a3bd05e2654e0e868fe with SHA-1 860fd4b6a2 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886042
Change-Id: I506a698a7aefed5fddc11a4fa4d61025f5c19ec5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions