tree af39ceb9c6cb26c3ee1ea02c1e03de9a2486ac93
parent 7b7476fd9f27db9d59917ba86e357ea3350f98a9
parent 49a250a884681b501591f55b06c5c173d0aa867c
author Tyler Gunn <tgunn@google.com> 1398862204 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398862204 +0000

am 49a250a8: (-s ours) am 46b9a3fb: (-s ours) am 7e1f0464: am 90092bfb: Merge "Restricted the tap target for "All Contacts" to the "All Contacts" button alone.  DO NOT MERGE" into klp-dev

* commit '49a250a884681b501591f55b06c5c173d0aa867c':