tree a1779e273678b4a299aaa9d8ba0bb8f79dd41c6c
parent 3e79edd2e659a7b9d521dc1c099a25411a136b6e
parent 0e8291ce313c73fdc9dde002136160f077e233f9
author Michael Jurka <mikejurka@google.com> 1368050668 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368050668 -0700

am 0e8291ce: (-s ours) am 1b89ad48: Merge "DO NOT MERGE Fix bug where folder was almost transparent" into jb-mr2-dev

* commit '0e8291ce313c73fdc9dde002136160f077e233f9':
  DO NOT MERGE Fix bug where folder was almost transparent