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