tree 76c91f98aa69e8db57cdceba2e1277547a5ccd98
parent 0371179bb5009699f4c463ba8ad07edbdaf52fe3
parent 79568720bfb745c5c136d4fbb5031a0b7e2e95ea
author Adam Cohen <adamcohen@google.com> 1317438709 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1317438709 -0700

am 79568720: Merge "Fixing issue where folder icon shows holographic outline."

* commit '79568720bfb745c5c136d4fbb5031a0b7e2e95ea':
  Fixing issue where folder icon shows holographic outline.