Merge branch 'cm' into HEAD

Signed-off-by: DHOMD <DHO@dho.im>

Conflicts:
	src/com/android/incallui/ContactInfoCache.java

Change-Id: Iebd35d30dff4fb1cc3cd02113e6637a56d291f36