tree 14c8c8638499da31c33841c62744c0d229ac43cf
parent d80dc80dbf15f0329a085b21e6e6e4c993e68505
parent 7725c79a80f0962c7e1cb38a3405d0676d184ee1
author Michael Jurka <mikejurka@google.com> 1368035526 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1368035526 +0000

Merge "DO NOT MERGE Fix bug where folder was almost transparent" into jb-mr2-dev