am 228067ac: Merge change 27116 into eclair

Merge commit '228067ac6ab57aef85a34465b95e0a25c8bbc450' into eclair-plus-aosp

* commit '228067ac6ab57aef85a34465b95e0a25c8bbc450':
  Fix http://b/2131173 (gaps between Gallery tiles).