tree 3cf84d02f2cd002e39176b4387758b2b1b1a4afd
parent ced7b003d591e00dd954766f035cfa308ce77820
parent 97dead1ee7b4aaa36f8829dfd2b40bf04a8d9457
author Winson Chung <winsonc@google.com> 1392411610 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411610 +0000

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

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