tree 3cf84d02f2cd002e39176b4387758b2b1b1a4afd
parent e7d1b745f9ed291cd43ab738b63f0565eeb77ddc
parent 5cafbe930e61015a1e3b200669a56d1bd743b771
author Winson Chung <winsonc@google.com> 1392411147 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411147 +0000

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

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