tree 6830153c1a327ee64e4182a84ee3a3dfda286ce9
parent 240946d7c8f10d27e5ffc3bafbd88d3babb1ff84
parent 156fbff4a2afaddf078282d23b53375f2caad3df
author Adam Cohen <adamcohen@google.com> 1380722297 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380722297 -0700

am 156fbff4: am 7f331b6b: Merge "Change folder icon item overlay to white (issue 11030725)" into jb-ub-now-indigo-rose

* commit '156fbff4a2afaddf078282d23b53375f2caad3df':
  Change folder icon item overlay to white (issue 11030725)