tree afee34e3fa37e980990deefac8f66fbfe24dbb4e
parent 5ea382d2080a5854ac9c8397e27d2b895e520470
parent 41ccfff36a9d4f5a52aaef3acbe295fdfd2d0e37
author Winson Chung <winsonc@google.com> 1348787959 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348787959 -0700

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

* commit '41ccfff36a9d4f5a52aaef3acbe295fdfd2d0e37':
  Updating launcher layouts (Bug 6955380)