tree eb5162704a20b07b6b5988f5b7fe272803b1bb7f
parent 64f4f6d382ee5da823e1fb290894b36e5bac714a
parent c76b0646efe2c58fef82159461e3350f69904583
author Andrew Flynn <flynn@google.com> 1336553733 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336553733 -0700

am c76b0646: Merge "7" launcher changes." into jb-dev

* commit 'c76b0646efe2c58fef82159461e3350f69904583':
  7" launcher changes.