tree afee34e3fa37e980990deefac8f66fbfe24dbb4e
parent b1dfe25ae1fffafb5e4ac22c21fd60d6b1b713cf
parent 411a3001d660f84565c19c37de5f26ee2302aa0a
author Winson Chung <winsonc@google.com> 1348787859 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1348787859 -0700

Merge "Updating launcher layouts (Bug 6955380)" into jb-mr1-dev