tree 14c8c8638499da31c33841c62744c0d229ac43cf
parent aec5943f7996219482cf4fecfdf9485fd5953f91
parent 1b89ad48536bc247d9611d374f733611cb8eaf13
author Michael Jurka <mikejurka@google.com> 1368037041 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368037041 -0700

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

* commit '1b89ad48536bc247d9611d374f733611cb8eaf13':
  DO NOT MERGE Fix bug where folder was almost transparent