Squashed commit of the following:

commit 04976c573d476b1b970bda5f445bfc8fd5dd4b83
Merge: 5072e21 39cac9a
Author: Danny Baumann <dannybaumann@web.de>
Date:   Thu Jun 13 04:51:17 2013 -0700

    Merge "Update MAP code from upstream." into cm-10.1

commit 39cac9ae3b7fe933f7851bb3910048d7ef2793bd
Author: Danny Baumann <dannybaumann@web.de>
Date:   Thu Oct 11 14:59:04 2012 +0530

    Update MAP code from upstream.

    This includes the following commits from CAF's jb branch:

    25352f2167fabad4a9b1a469dc37765777010fb4
    - Return Empty MessageList when invalid filterset is set

    55ce29ed32fb254227a7435f2cdc4b48a771ec9a
    - Update Email account in MAS when BT turns on

    ede64a7e854fb6a8e8cfc8839950638563d49bd9
    - Modify condition check to display MMS in deleted folder

    2e63168fc9d482af3b604cca9ad4ec94f3955a7d
    - Fix Exception generated during pushing email to outbox

    6abf35a5d3fca88dece7db020391dc0f0ed29fd5
    - Use proper masking to retrieve Read MMS and Email messages

    e7b956351ab68ede2a0e3f7f8149d10a20c400ad
    - Bluetooth: MAP: Fix Cursor leak

    86fd36a3f73a857e6f2645196d6e15439ddb0dd9
    - Bluetooth: MAP: Filter by MMS types shown to user

    4e98fcfa88c008f458ee4ead94d427a1cf4dcb89
    - Bluetooth: MAP: Support missing Filter options for MMS

    d2aa5c3643ddae54d65e43578fbf3dc529cc07a1
    - Bluetooth: MAP: null check for senderName

    f94a99868069fbd90318197246c8ececc1517860
    - Reject Email getmessage request with charset as native

    Change-Id: Ie405fe1556db859482608d6576ca4d67bd7d1f6f

commit 5072e21f0a8d7c84c7ae894adda44c506fc348fe
Author: Francesco <francescoforesta@email.it>
Date:   Sat Jun 1 10:18:30 2013 +0200

    Bluetooth: Update italian translation

    Change-Id: Id5f1ed9bb3fd390cbc3d631b419796a19aab3faa

commit 3c231e568b7fc15390d9881c43286629f4c2f64a
Author: Danny Baumann <dannybaumann@web.de>
Date:   Fri May 31 09:46:34 2013 +0200

    Fix MAP SDP record generation [3/3].

    Register MAS server sockets for UUID/port pair instead of only port so
    lower layers have the chance to correctly generate the SDP record.

    Change-Id: Ia93f79a290aa23b4ad8370096606678c31d12df5

commit 7f1df9eed0792f7a5c1d88979aa098c1facdbd42
Author: jackmu95 <jacob.mueller.elz@gmail.com>
Date:   Mon May 27 19:22:19 2013 +0200

    Bluetooth: German translation

    Change-Id: I1e13ac1b65c9cc7f0d21ebf1fd50299d458f7dba

commit 3962f79f97320c33cec75b1f2d8874a0543b69ed
Author: Martin Gerczuk <admin@android-rsap.com>
Date:   Tue Feb 7 19:14:10 2012 +0100

    Added support for Filter parameter for PBAP function PullPhoneBook

    VW Premium car kit sometimes behaves strangely if it receives entries with unexpected fields.
    E.g. it does not like mail addresses with additional attributes.

    Change-Id: I6d3145d802ad87e5fb47217a213f9bcb12670f60
    Signed-off-by: Martin Gerczuk <admin@android-rsap.com>

commit 63805cc6e5085db9dc42bfd430bca6a09d939fd2
Merge: c66689a bc96577
Author: Danny Baumann <dannybaumann@web.de>
Date:   Sun May 26 23:20:06 2013 -0700

    Merge "Fix MAP accept threads sometimes spinning endlessly." into cm-10.1

commit bc965770a09f67904351291ba13dbefd78ea6092
Author: Danny Baumann <dannybaumann@web.de>
Date:   Fri May 24 13:21:51 2013 +0200

    Fix MAP accept threads sometimes spinning endlessly.

    Randomly (under no obvious precondition), the MAP access threads spinned
    endlessly after enabling BT, because mServerSocket.accept() always threw
    IOExceptions, probably because the actual socket was already closed.
    This change makes sure to exit the thread when that happens to not waste
    CPU cycles and battery power.
    This tracks similar changes done to the BluetoothPbapService and makes
    sure to follow the (working) PBAP flow.

    Change-Id: Iade905f0ea8829cce9666ddaebee7a8fd01f62b0

commit c66689aefdb3ad55289ee246f7ad68d6e3b6f4ff
Author: okrt <ogzkirat@gmail.com>
Date:   Wed May 22 04:31:37 2013 +0300

    Bluetooth: TR translations

    Change-Id: I0aded225f735162a5b2807d9a632e282686899cf

commit 9bd3b2e3af27b3fb4bb78c7e7af9b1e1c3640253
Merge: 5f9554b 71146f7
Author: Marco Brohet <therbom@gmail.com>
Date:   Sat May 11 12:59:16 2013 -0700

    Merge "Bluetooth: Simplified Chinese Translations" into cm-10.1

commit 5f9554b467b50741efe678d92c461419fb77ad9f
Author: Odin Ugedal <odinuge@gmail.com>
Date:   Thu May 9 21:52:53 2013 +0200

    Bluetooth: NB translation

    PS2: Trying to make Cid happy!

    Commit for staging: http://review.cyanogenmod.org/#/c/37284/

    Change-Id: Idbcafb44bfc5047cec2ce7e3a644046994feac20

commit 71146f76eb2290953d25a1292416a0a631baa6a5
Author: Andrew Jiang <sam.andrew.jiang@gmail.com>
Date:   Fri May 10 18:32:19 2013 -0400

    Bluetooth: Simplified Chinese Translations

    Change-Id: Ie3d4aa11cea6e24a9597e7741a931018b09cb7bb

commit f452dc067c67087f5b990915cfef21b41a0eee0f
Author: Jacob Overgaard Madsen <u2jacob@gmail.com>
Date:   Mon May 6 22:15:50 2013 +0200

    Bluetooth: DA translation

    Change-Id: I5913fe9cf32efa64f07ae53fdc8dbc9c7a48beda

commit ef61f8ebbf1119a29617dddbcf0a7753bf29bf2b
Author: Steve Kondik <shade@chemlab.org>
Date:   Mon May 6 22:38:53 2013 -0700

    Fix crash during BT shutdown

     * Socket may be null if we're shutting down, avoid a crash here.

    Change-Id: I9a90a2e9cc8486d65351da1f7bd2cf34e986b80a

commit 003778be18176b04bfb27b15ebadaa7c1c6fba85
Merge: f385553 054f5c7
Author: Marco Brohet <therbom@gmail.com>
Date:   Tue Apr 30 15:28:09 2013 -0700

    Merge "Bluetooth: AF translation" into cm-10.1

commit f3855538bcf2a36cbeda403e2c8d50a30b10858c
Merge: 9b88b7c 37d6dfa
Author: Marco Brohet <therbom@gmail.com>
Date:   Mon Apr 29 01:50:17 2013 -0700

    Merge "Bluetooth: NL translations" into cm-10.1

commit 9b88b7cc4dc38a7e9a86b64f4d9815d4fe27a5ef
Merge: a56cdc0 2c7c0ff
Author: Danny Baumann <dannybaumann@web.de>
Date:   Mon Apr 29 00:32:11 2013 -0700

    Merge "Bluetooth: PT-BR update translations" into cm-10.1

commit a56cdc099e02cc45c0f7d712fa1798f5afcc389e
Merge: 42d1b69 e6e4c73
Author: Steve Kondik <shade@chemlab.org>
Date:   Sun Apr 28 20:41:02 2013 -0700

    Merge "Allow sending/receiving of APK files over bluetooth" into cm-10.1

commit 42d1b690474f2c6d846c99a67e8ac16afbd53521
Merge: 07db370 5e7d9d7
Author: Marco Brohet <therbom@gmail.com>
Date:   Sun Apr 28 15:32:57 2013 -0700

    Merge "Bluetooth : move CM strings in cm_resources.xml" into cm-10.1

commit 37d6dfac765f0573acbb44d514117947132e4339
Author: Marco Brohet <therbom@gmail.com>
Date:   Sat Apr 27 19:33:42 2013 +0200

    Bluetooth: NL translations

    This change adds translations for CyanogenMod additions
    and reverts to AOSP translations

    Change-Id: Ifd7b43f8b15ce87fda79f84e0c802a1d53dad22b

commit 5e7d9d7706c661f75e92a9e5ce1c68c639ccb32a
Author: DelPETER <delphinpeter@gmail.com>
Date:   Sun Apr 28 23:13:26 2013 +0200

    Bluetooth : move CM strings in cm_resources.xml

    All CM strings are move in cm_strings.xml
    AF, IT and NL are in progress
    All others langagues are not translated or already moved.

    Patch set 2 : resources line correction

    Change-Id: I712e2c02b507e2fbdb304a5b716765d68b634a37

commit 07db3704ce561d619a448da977e84ed2185e151c
Author: rheeze <mauro.bazzano@gmail.com>
Date:   Sun Apr 28 20:42:03 2013 +0200

    Bluetooth: Update italian translation

    	Do the translation refactoring with cm_* resources

    Change-Id: I38bac1af762f022033f6752f2544741e7cf68e4e

commit 054f5c75038d06c7d44848d97caa938ab66fc01f
Author: isimobile <isimobile@ismaakit.com>
Date:   Sun Apr 14 18:34:57 2013 +0200

    Bluetooth: AF translation

    Change-Id: I073b431ca17f8ffae4fc5deeb8589dae70fd7eba

commit 2c7c0ff647d2fd24b583a03018dac25ec41aa709
Author: Gustavo <gustavo@gustavo.ca>
Date:   Sun Apr 28 00:54:47 2013 -0700

    Bluetooth: PT-BR update translations

    Change-Id: Ieadbecdb7955881ec699c49e37f825cc311f40db

commit 3596dceb918aa5a0de24484b01ea883d77d53347
Author: DelPETER <delphinpeter@gmail.com>
Date:   Sat Apr 27 22:12:37 2013 +0200

    Bluetooth : FR translation

    Change-Id: I96944994bc29a7f17f14fc1aadbca38932c74950

commit 8d388f637a16d9a44fa31c95827006aaf295755a
Author: Marco Brohet <therbom@gmail.com>
Date:   Sat Apr 27 14:07:07 2013 +0200

    Bluetooth: Refactor default translations

    Change-Id: Ic814dc1367f7e40d374fd1c261f86895ef59c76d

commit e6e4c733ce6738190cc665294769d1da2e3a7715
Author: Nebojsa Cvetkovic <nebkat@gmail.com>
Date:   Wed Apr 24 15:51:13 2013 +0100

    Allow sending/receiving of APK files over bluetooth

    Change-Id: Ibfc795005dc9c8054b044112feff4a17c24c5e27

commit 5e8b0edc008b820b9674d0356cf102d89fb68ab8
Author: djMesias <djmesias@terra.es>
Date:   Thu Apr 18 12:11:06 2013 +0200

    Bluetooth: ES translations

    - Add missing translations
    - Move CM additions to new file
    - Restore AOSP strings

    Change-Id: Ia1082ec5321d60db8e5caa7efa180afce020d647

commit 93bdeae91fe2b0acc4671a97891038e1c4e924f3
Author: Tamás Tóth <syman@babulus.hu>
Date:   Thu Apr 18 09:32:43 2013 +0200

    Added missing translation

    Change-Id: I20150f1c79578eaae5916094531d17d8ce3ee39e

commit a71be06488722ff693fb9a11acb0e56a39f6a041
Author: Michael Bestas <mikeioannina@gmail.com>
Date:   Sun Apr 7 22:18:18 2013 +0300

    Bluetooth: Reorganize Greek translations

    Revert AOSP strings & reorganize CM additions

    Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

    Change-Id: I1309f7a2762b7bdd1b5dd8e6a61cbf39360ef66c

commit 97e80abacccd4d644a7d06c9da2830a24238636b
Author: DelPETER <delphinpeter@gmail.com>
Date:   Tue Apr 2 22:14:56 2013 +0200

    Bluetooth : reorganize and add french translation

    Patch set 2 : correction
    Patch set 3 : correction
    Patch set 4 : correction

    Change-Id: Id456afe563bb00dd75eaf92b2b23b8ce6a6156eb

commit 700d8b618ca934f5bcdf3e18d6e341875b98fa5a
Author: László Dávid <laszlo.david@gmail.com>
Date:   Thu Mar 28 22:12:12 2013 +0100

    Accidentally removed bugfix in BluetoothMasObexServer

    This is the original change-set:
    https://github.com/CyanogenMod/android_packages_apps_Bluetooth/commit/18e2a650606243619fde236fc773ecdc596183c3

    This is the merge change-set which removes the bugfix:
    https://github.com/CyanogenMod/android_packages_apps_Bluetooth/commit/cc1d9b002d0319aacf771f270bfe4b6b23aea5d9

    Change-Id: Ie4dc42417787235aa6c6d0c70af540c7fee13f6a

Change-Id: I459f2cccaa08f2ff024d9b055b54635a4fbbc076