diff options
| author | Winson Chiu <chiuwinson@google.com> | 2020-06-27 16:43:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-27 16:43:36 +0000 |
| commit | 129ffb5c25bc88f730b348047f1425c544433b9e (patch) | |
| tree | ee3804b43bb20a0cbbde63169c77ea906bab2448 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 72287edf0ff7b404ddff16da6e2806b1379f973e (diff) | |
| parent | 85f7bf8b3253f8e630f14773224aa15be5bcb3e4 (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: faa7dff057 -s ours am: f3a8e67ba5 -s ours am: 85f7bf8b32 -s ours
am skip reason: Change-Id I54d236c0a6daaa934bd64a3bd05e2654e0e868fe with SHA-1 e1843e8a1f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886042
Change-Id: I2f953e9f6b79aebbe71b6e3749b74a2bc0048b18
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions