tree 10da860fcff71886af91d082e31f0e1917926848
parent b18320ecd3b3be6ec2d5a70953b6ba84f21309ed
parent 03cc73bcc72f99b6b6caeca393be85a80e203c04
author Winson Chung <winsonc@google.com> 1414566292 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566292 +0000

am 03cc73bc: 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 '03cc73bcc72f99b6b6caeca393be85a80e203c04':