Log Activity truncation: only count longer lines towards the 30 lines
before truncation.
Merge branch 'dev' of https://github.com/mozilla/MozStumbler into truncation-counter

Conflicts:
	android/src/main/java/org/mozilla/mozstumbler/client/subactivities/LogActivity.java
Merge pull request #1119 from garvankeeley/truncation-counter

Log Activity truncation: only count longer lines towards the 30 lines before truncation.