tree 20f31deb8ebfc41998f054cf395723ab6b3b9852
parent e27da37ae58eb3ef6c25ef882f65cca0766f4ad1
parent 9e8e38a8d79f3f5157464154e0f8ea3d9338946d
author Winson Chung <winsonc@google.com> 1392410226 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410226 +0000

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

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