tree ec17943a3f1d64f301153986c610ca1631227b9b
parent 05be6b7649d606b9a6deae7f9daf99cc33ab570d
parent e3fe3f89ee956e8d7995c569948cb70765ec19b8
author Sunny Goyal <sunnygoyal@google.com> 1437162197 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437162197 +0000

am e3fe3f89: (-s ours) am 249a510a: (-s ours) [DO NOT MERGE] Adding minSpanX and minSpanY for all the launcher widgets

* commit 'e3fe3f89ee956e8d7995c569948cb70765ec19b8':
  [DO NOT MERGE] Adding minSpanX and minSpanY for all the launcher widgets