tree 10da860fcff71886af91d082e31f0e1917926848
parent e284d0089947afda2ea8b27f4c7b628af1a3024a
parent 7d88429c81d64ae4e5bb0314c47d4641998d7aee
author Sunny Goyal <sunnygoyal@google.com> 1422666469 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666469 +0000

am 7d88429c: am 22308ce1: Merge "Updating the icon click feedback" into ub-now-porkchop

* commit '7d88429c81d64ae4e5bb0314c47d4641998d7aee':