diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-03 22:37:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-09-03 22:37:52 +0000 |
| commit | 42781fa875e1db4021f16af0e73b1c48e635b251 (patch) | |
| tree | 999271e5acef206d196c847b6808bb14cb144d23 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 606f36288e587c2dfa5f2e38b15560fc3d357d18 (diff) | |
| parent | 5e9f5e03cae0a723c51dff8f7d238c31109a774f (diff) | |
Merge changes from topic "am-7d2d9cdc160045768d103b187e51cab6" into rvc-qpr-dev-plus-aosp
* changes:
Merge "DO NOT MERGE Fix NPE in executeDeletePackageLIF." into rvc-dev am: 17d62ac4c7 am: 8218f351d8 am: be69e09c86
DO NOT MERGE Fix NPE in executeDeletePackageLIF. am: 01e0f4813a am: b2487b7862 am: 4bd6c09f00
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions