tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 32341118452531f895cabdc7285d1371906859bf
parent db04b94518d59c2a7975fedae75c1d41009d2b22
author Sunny Goyal <sunnygoyal@google.com> 1422685298 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685298 +0000

am db04b945: am 03463317: am 2db95a60: am 4a0eda76: Merge "Updating the UI for focused state of an icon/folder." into ub-now-porkchop

* commit 'db04b94518d59c2a7975fedae75c1d41009d2b22':