tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent eb1e5252232ce030e0c87991ae08aecaa14365ae
parent 3c326cf80050f38c651b4d744928cbefa5cf79dc
author Adam Cohen <adamcohen@google.com> 1392410137 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410137 +0000

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

* commit '3c326cf80050f38c651b4d744928cbefa5cf79dc':