track local contacts
Merge branch 'jb-devel-release' of github.com:codefireXperiment/android_manifest into jb-devel-release