tree cba62d0d64153aa2169651696bc238591341d679
parent e5b6af7319bcd301aa1efe9fb9314ad848abf82e
parent 84c216cdf5a0672d9ba13bfc4480c5bb1d36801d
author Adam Cohen <adamcohen@google.com> 1414085402 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085402 +0000

am 84c216cd: am 946b9491: am 9fd14da0: am 7397e624: Add visible touch feedback to items in folders

* commit '84c216cdf5a0672d9ba13bfc4480c5bb1d36801d':