diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-06-28 17:26:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-28 17:26:40 +0000 |
| commit | c9a076a882429bb82f81cc72f08acc61e7c508b1 (patch) | |
| tree | e2ef83b9a5c31b17d4b9691bea802605b74dc14e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6c8698a625cd7120ef45dac7d227a39d4593b64c (diff) | |
| parent | aa2d4b75e1fdd8755368a82f3f58285136aa9003 (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: aa2d4b75e1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14987346
Change-Id: Ic7bd40adeb6e2ab6207f074e960d3a9294ae86da
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions