tree 24259e36ecf4451f63a5daa000594afe23ca8af8
parent 41d6a30e140785561456a04b80e34d0089abe0cb
parent f26493f5a14449bd9f9630b81f0fec802b4fd943
author Adam Cohen <adamcohen@google.com> 1337121940 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337121940 -0700

am f26493f5: Merge "Tweaks to launcher layout on Nakasi" into jb-dev

* commit 'f26493f5a14449bd9f9630b81f0fec802b4fd943':
  Tweaks to launcher layout on Nakasi