Fabrice Di Meglio 204521626f resolved conflicts for merge of f9360dbc to master ...

Change-Id: I2e468d83a7ce5200c59f63b4362e7bee10d0a2eb

2014-06-12 15:46:41 -07:00

..

PrintJobSettingsFragment.java

am 03360cd2: am 196bc5c6: am e7b781f5: Merge "Show correct message for a print job that is being canceled." into klp-dev

2013-11-14 22:34:13 -08:00

PrintServiceSettingsFragment.java

resolved conflicts for merge of f9360dbc to master

2014-06-12 15:46:41 -07:00

PrintSettingsFragment.java

Push Local Printer Search action to the ActionMenu

2014-06-02 15:38:45 -07:00

PrintSettingsUtils.java

Rename SettingsUtils to PrintSettingsUtils

2014-04-21 15:58:41 -07:00