tree f5c922b232fd38ffb540b555f011baa08780405e
parent a49ab4f8f17d9c222275c6196220838528629c66
parent c1ae43ade0baa4dc8af1b505ba4b83f0f72c6dd8
author Adam Cohen <adamcohen@google.com> 1352421691 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352421691 -0800

am c1ae43ad: am f69320a1: Merge "Preventing more than five widgets from being added in the carousel (issue 7502935)" into jb-mr1-dev

* commit 'c1ae43ade0baa4dc8af1b505ba4b83f0f72c6dd8':
  Preventing more than five widgets from being added in the carousel (issue 7502935)