am 96454d03: removed automatic popping up of vm number edit dlg upon display of vm settings screen Bug: 2547770
am 1d084f60: merge from open-source master
am 3ed62ccb: am 15fc434c: revert the stripping of System Group: from the names of google system groups
am 331367db: am 6d50f0fd: Sapphire: disable menu button hint if it would overlap the SlidingTab
am 72b18023: am 4d7169a3: Merge "Send the disconnect initiator extra with the DISCONNECT Headset state." into froyo
Make SimContacts torelate null cursor.

Bug: 2355318
Change-Id: If563915c5a9f3f3bde46cfe9aa48b75bcc3d75ed
Merge "Make SimContacts torelate null cursor."
am 02139e8e: merge from open-source master
am ce397a39: am 9791da9b: Throttling settings UI
Reset AT phone state on a remote disconnect.

Bug: 2412195

Change-Id: I713a32feddb22c25d3235bdb56d801937c9adda8
Merge commit 'f9c549727443684858dc2e0fd4fdfab3b1066d76' into oxygen_4.3

* commit 'f9c549727443684858dc2e0fd4fdfab3b1066d76':
  Make SimContacts torelate null cursor.
Merge commit 'a43c1209131a1d87b749a1f1310dbd18227c3148' into oxygen_4.3

* commit 'a43c1209131a1d87b749a1f1310dbd18227c3148':
  Reset AT phone state on a remote disconnect.