testing carbons
Merge branch 'testing' of github.com:projectcmb/android_packages_apps_ContactsCommon into testing