diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-06-28 16:54:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-28 16:54:55 +0000 |
| commit | 1adb574d86e15e843758d31ca96484008f25db17 (patch) | |
| tree | 7d9a78b8230d3d5e01045e0cc4c70fa1b75aabfc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5861d3d38586f3502173bff72031a3783c93bc0e (diff) | |
| parent | 435e40f3991b79be2fbcbd75f5f95ca5625cf87b (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14987346
Change-Id: I3fe42532b1fa30fbf9c60c8aba28584b5787fc45
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions