am 5168509f: Merge "Trimming: clean up strings and prevent too short or no trimming." into gb-ub-photos-arches

* commit '5168509fe260a9d549278a9a287c3d7e0c1b739e':
  Trimming: clean up strings and prevent too short or no trimming.
tree: 41454d474dc34d2404ef8d8feca00a7ea28ac397
  1. actionbarsherlock/
  2. res/
  3. src/
  4. tests/