tree c028bfe537607823c37e2ffc8c713c73059d3130
parent edc1f196eaa53784208c574ece51fc5634f3820c
parent da29a4b6dd17a2dd0e8211d3e8b7f5c5f347e8a3
author Sunny Goyal <sunnygoyal@google.com> 1422685304 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685304 +0000

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

* commit 'da29a4b6dd17a2dd0e8211d3e8b7f5c5f347e8a3':