tree 6ee2bcf14f49dcaf1167ea62ac4ced1f0cd1c414
parent 05ea1beadefe1cc6bc4b839ea91d78227fd03701
parent 2e68c9b614a2cca37ecbbc1aaf2c1427f2886abf
author Winson Chung <winsonc@google.com> 1348817723 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348817723 -0700

am 2e68c9b6: am 41ccfff3: Merge "Updating launcher layouts (Bug 6955380)" into jb-mr1-dev

* commit '2e68c9b614a2cca37ecbbc1aaf2c1427f2886abf':
  Updating launcher layouts (Bug 6955380)