OSDN Git Service

am 03360cd2: am 196bc5c6: am e7b781f5: Merge "Show correct message for a print job...
authorSvetoslav <svetoslavganov@google.com>
Fri, 15 Nov 2013 06:34:13 +0000 (22:34 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 Nov 2013 06:34:13 +0000 (22:34 -0800)
commit7662c1f21ff4fad232b4ae908296dc85a851beb4
tree8d0e5601ade79fd9de0b9c3acff12e546c5fa222
parent35684faff1cb7b4a925e91c5a0c2e733aed694e5
parent03360cd23910c73c78a822c559acb3eb66a8e07b
am 03360cd2: am 196bc5c6: am e7b781f5: Merge "Show correct message for a print job that is being canceled." into klp-dev

* commit '03360cd23910c73c78a822c559acb3eb66a8e07b':
  Show correct message for a print job that is being canceled.
res/values/strings.xml
src/com/android/settings/print/PrintJobSettingsFragment.java