am 87f9e06a: am a0829540: Don\'t save slideshow activity in history
am 87f9e06a: am a0829540: Don\'t save slideshow activity in history

Merge commit '87f9e06a8410001e8ad68c557071ba4c07a23266'

* commit '87f9e06a8410001e8ad68c557071ba4c07a23266':
  Don't save slideshow activity in history

bmaupin/android-sms-plus