tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 0a2107266f03709b1859441cfa7fa2e7a31d2b52
parent a0389ae4592f5e631b1c216b51b1c4d2b2ce8570
author Sunny Goyal <sunnygoyal@google.com> 1422669686 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669686 +0000

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

* commit 'a0389ae4592f5e631b1c216b51b1c4d2b2ce8570':