tree 9bb91db7d48e62fd2375c50c40de0fcd4f948913
parent a1f098d921eae6b59ea596ac091e606f6d2f578c
parent 68a4bc2820b106f64b1afd57c603a07e1da7374c
author Christine Chen <christinech@google.com> 1380686297 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380686297 -0700

am fe12ee59: am f773d1a8: Merge "Changes primary call card padding" into klp-dev

* commit 'fe12ee595656214370702fdd6031b5cdd39b338f':