am 68e4ae64: Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches

* commit '68e4ae64380e2c9843faaec63b98ba51479c0f11':
  Fix overdraw in FilterShow activity
tree: cf28196d8f6757d559be2838bca3298445f6c0b4
  1. tests/
  2. AndroidManifest.xml