tree 901a0534ff6719e940fd63eb9733c7ab8d85cd91
parent af2abd906b65aa5324ca2ddc68ef3765d41bffc0
parent 5fca50490746c52c2ec977529af3bbf17ce3b285
author Adam Powell <adamp@google.com> 1399848143 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399848143 +0000

am 7b7d5e43: Merge "New, inkier EdgeEffect visual style"

* commit '7b7d5e4347ca9f7cddbec07cea752756f8c1ac47':
  New, inkier EdgeEffect visual style