diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-20 19:48:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-20 19:48:01 +0000 |
| commit | 583996de92ba6c9af3c9346c7d1f21a9189a45bf (patch) | |
| tree | df57cb4745ec697c5b99fea1149a3e84afa949fa /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2baabee7bb5ecdb4ef36b7fd99c2556c5848961a (diff) | |
| parent | 77b5d6436cb9e3ef9e068371364eb5b6abfe564f (diff) | |
Merge "Protect android.nfc.action.ALWAYS_ON_STATE_CHANGED" am: c88231bcba am: 77b5d6436c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552504
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8a2a7da344ac0c8eeb893b45eb8a16e4b07147c7
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions