Merge remote-tracking branch 'refs/remotes/cm/cm-10.1' into jb-4.2
merge remote tracking branch 'cm/cm10.1' into jb-4.2

Signed-off-by: travp624 <travp624@gmail.com>
Merge remote-tracking branch 'refs/remotes/cm/cm-10.1' into jb-4.2

Conflicts:
	res/layout/call_stats_activity.xml
	res/layout/call_stats_list_item.xml
	res/layout/double_date_picker_dialog.xml
	res/values-de/strings.xml
	res/values/strings.xml
	src/com/android/contacts/callstats/CallStatsActivity.java
	src/com/android/contacts/callstats/CallStatsAdapter.java
	src/com/android/contacts/callstats/CallStatsDetailActivity.java
	src/com/android/contacts/callstats/CallStatsDetailHelper.java
	src/com/android/contacts/callstats/CallStatsDetails.java
	src/com/android/contacts/callstats/CallStatsQueryHandler.java
	src/com/android/contacts/callstats/DoubleDatePickerDialog.java

Signed-off-by: travp624 <travp624@gmail.com>
Merge remote-tracking branch 'refs/remotes/cm/cm-10.1' into jb-4.2

Signed-off-by: travp624 <travp624@gmail.com>
Merge remote-tracking branch 'refs/remotes/cm/cm-10.1' into jb-4.2

Signed-off-by: travp624 <travp624@gmail.com>
Merge branch 'jb422' into jb42