Jeff Sharkey 0ab7007631 resolve merge conflicts of 358f0d4fc8 to master ...

Bug: 174932174
Test: I solemnly swear I tested this conflict resolution.
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Change-Id: I9262a08ffc1ccede8e519d0eed90ed2bfcf0232c

2020-12-08 11:01:05 -07:00

..

pdf

…

ILayoutResultCallback.aidl

…

IPrintDocumentAdapter.aidl

…

IPrintDocumentAdapterObserver.aidl

…

IPrinterDiscoveryObserver.aidl

…

IPrintJobStateChangeListener.aidl

…

IPrintManager.aidl

…

IPrintServicesChangeListener.aidl

…

IPrintSpooler.aidl

…

IPrintSpoolerCallbacks.aidl

…

IPrintSpoolerClient.aidl

…

IWriteResultCallback.aidl

…

OWNERS

…

package.html

…

PageRange.aidl

…

PageRange.java

…

PrintAttributes.aidl

…

PrintAttributes.java

…

PrintDocumentAdapter.java

…

PrintDocumentInfo.aidl

…

PrintDocumentInfo.java

…

PrinterCapabilitiesInfo.aidl

…

PrinterCapabilitiesInfo.java

…

PrinterDiscoverySession.java

…

PrinterId.aidl

…

PrinterId.java

…

PrinterInfo.aidl

…

PrinterInfo.java

…

PrintFileDocumentAdapter.java

…

PrintJob.java

…

PrintJobId.aidl

…

PrintJobId.java

…

PrintJobInfo.aidl

…

PrintJobInfo.java

…

PrintManager.java

…

PrintServiceRecommendationsLoader.java

…

PrintServicesLoader.java

…

TEST_MAPPING

…