tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 417f9d8ecd9db2a92d176d8aa51eb68d6e5ed032
parent 0346331767335c3c8a658bf6f2fdf0b005904a89
author Sunny Goyal <sunnygoyal@google.com> 1422669680 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669680 +0000

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

* commit '0346331767335c3c8a658bf6f2fdf0b005904a89':