tree 5f5f8a02f3677c9cfee7647a3573b63249980938
parent 4292dd644a9c344a2eac168be19be65af0f4f723
parent 4a0eda76baeba2d8af2cc57ec64dcead03384cde
author Sunny Goyal <sunnygoyal@google.com> 1408409426 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408409426 +0000

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

* commit '4a0eda76baeba2d8af2cc57ec64dcead03384cde':
  Updating the UI for focused state of an icon/folder.