diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-06-28 17:11:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-28 17:11:04 +0000 |
| commit | aa2d4b75e1fdd8755368a82f3f58285136aa9003 (patch) | |
| tree | 534e1492d214123b98cc40ab3646573376592650 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 31554e8b7b17c62cafeeacc33d360d88ba049a46 (diff) | |
| parent | 1adb574d86e15e843758d31ca96484008f25db17 (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: 1adb574d86 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14987346
Change-Id: I04ae67469045936ecd2d9ae23388454954ca2de2
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions