tree 10da860fcff71886af91d082e31f0e1917926848
parent 6b55cd71ac4d4414739deaf4cb0aaa04f507da0a
parent 2db95a607434908c25796e44946e92ee59548ce6
author Sunny Goyal <sunnygoyal@google.com> 1422666462 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666462 +0000

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

* commit '2db95a607434908c25796e44946e92ee59548ce6':