tree 2e54c89647edc53308d87f561d80c0e71f945d68
parent d0fd73d7c5ddc1ff17097f24cdfcfc2120e57096
parent ba346f9d8d681c3c8166609382eb882e538b9b05
author Alan Viverette <alanv@google.com> 1394503856 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1394503857 +0000

Merge "Unify touch feedback drawable and reveal drawable"