diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-06-26 01:30:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-26 01:30:46 +0000 |
| commit | a6d89f27f7c476d2e64c981c93dc0e1e812f0a2a (patch) | |
| tree | c1aa21ee545421cf9a272ad11c30a0336c12ec3d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | fab997529fe879a59c9ab78a230883ae3d40c6be (diff) | |
| parent | 4042304ccb39d2303b206ec21dba31baa65ac811 (diff) | |
[automerger skipped] Merge "DO NOT MERGE Add cross-user check for getDefaultSmsPackage()." into qt-dev am: 71ee31239e am: 538b54a115 -s ours am: 435e40f399 -s ours am: 4042304ccb -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14987346
Change-Id: I21eb32b166faffc1d909acb2bee2f715bdad3f15
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions