merge tags 'android-4.2.2_r1' into jb-4.2

also included is changes pulled from cm/cm-10.1

Signed-off-by: travp624 <travp624@gmail.com>
Mms: Restore correct drawable for save button

Before: http://goo.gl/1p4s7
After:  http://goo.gl/ZJskd

Patch set 2: Trying to fix parents

Change-Id: I24546dda03f783e43e05ddf40ab576a3fda0dcec
Mms: Add "Insert contact info" back

Bring back the ability to insert contact info (Phone numbers, Email addresses,
Events, Postal address and Website), in a SMS or a MMS, as a text.

Compared to gingerbread/CM7: - several info can be inserted thanks to checkboxes
                             - no more adapter (not really needed)
                             - Event info added
                             - feature is under Menu, not Add attachment

    * Patch Set 1: initial commit
    * Patch Set 2: corrections, better strings, util/DateFormat.java added
    * Patch Set 3: Cleanup
    * Patch Set 4: Change information to info in title

Change-Id: Ida4a9d52d83a909f55e54d272849fe16c6781681

Conflicts:
	res/values/strings.xml
	src/com/android/mms/ui/ComposeMessageActivity.java

Signed-off-by: travp624 <travp624@gmail.com>

Conflicts:
	res/values/strings.xml
MMS: Change Android emoji back to original emoji set

This change allows for more easily identifiable emojis by reverting the android emoji's that were introduced in change id I35bf45242780ef392567469b7a264e449f5dc589. This allows for a more consistent look through the emoji set and are also more understanding then the android emojis.

Change-Id: I8dd20c15d30619fdeec154fcb373acdaffa96612
fix duplicate imports error

Signed-off-by: travp624 <travp624@gmail.com>