tree f13f227855fbe4abfa323a68f34fc60fa3373ad1
parent 42bfb12c548fcd6c791a903c12d072988bfaa28c
parent 681a4aced8e3b5029aafdc3f45d3f47b96d26f9c
author Winson Chung <winsonc@google.com> 1382042772 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382042772 -0700

am 681a4ace: Merge "Updating folder icons when the shortcut is updated. (Bug 10803060)" into jb-ub-now-jetsonic

* commit '681a4aced8e3b5029aafdc3f45d3f47b96d26f9c':
  Updating folder icons when the shortcut is updated. (Bug 10803060)