tree cba62d0d64153aa2169651696bc238591341d679
parent f327a460aaa36e9d28a548a21d0f162ba2722533
parent 97dead1ee7b4aaa36f8829dfd2b40bf04a8d9457
author Winson Chung <winsonc@google.com> 1414085367 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085367 +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':