diff options
| author | Winson Chiu <chiuwinson@google.com> | 2020-06-27 16:43:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-27 16:43:26 +0000 |
| commit | 72287edf0ff7b404ddff16da6e2806b1379f973e (patch) | |
| tree | ee3804b43bb20a0cbbde63169c77ea906bab2448 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 577236b48e3e5d6101983e7a49c42b915a7a99dd (diff) | |
| parent | c95f21cb05a7ee74882fb72226df7432690f028f (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: e4b89514d7 -s ours am: a21741be62 -s ours am: c95f21cb05 -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/+/11886048
Change-Id: I6a1cdcde63a42262322a248a787dd6981a69b361
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions
