tree dcd56cea4ff5eb04ecb21f93975a62a2e95ef179
parent ded0c6dde7b4adb237dfd4189f875a1fd7ac99d5
parent 2916480f06f23b2b29deeb0c3c78dbb161a4ee49
author The Android Open Source Project <initial-contribution@android.com> 1337635731 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337635731 -0700

am 2916480f: Reconcile with jb-release nakasi-factoryrom-release

* commit '2916480f06f23b2b29deeb0c3c78dbb161a4ee49':
  Updating launcher assets.  (Bug 6499087)
  Change custom workspace cling
  Fixing regression where you can't add shortcuts
  Removing logging related to and fixing (issue 6238330)