Squashed commit of the following:

commit 2e5cc1908c3c27146109523eccab82a0562d8ffa
Author: prescott66 <prescott66@gmail.com>
Date:   Wed Aug 28 19:25:07 2013 +0200

    Bluetooth: SK translations

    Change-Id: Iff2a62b7e41a5a4ba6f27b52723820eda6de934e

commit c86e8fac13a1f27545baf184e54b00d35732770c
Author: Gaurav Asati <gasati@codeaurora.org>
Date:   Wed Aug 14 12:40:57 2013 +0530

    Bluetooth: Connect only A2dp Sink devices.

    DUT supports only A2DP source role,it should connect
    only with A2DP sink devices.RENDERING service must be
    supported by A2DP sink devices.Hence try to connect A2DP
    source only with these class of devices.

    CRs-Fixed: 507306

    Change-Id: I93d9d30185444473e79008b47b607802ec5e7f3e

commit 056b7431d489f08d67c7d76ba4d3303b49cfc054
Author: Pradeep Panigrahi <pradeepp@codeaurora.org>
Date:   Wed Aug 14 11:41:38 2013 +0530

    Bluetooth: Add trust device feature.

    Add set trust feature where the remote device is marked
    as a trusted device for subsequent connection.

    Change-Id: Iee491db2e5b6090761a4f42467ac36ed53923fc4
    CRs-fixed: 523135

commit d883affd10641fec548302aa75da6e5e4a9a848d
Author: arnau <arnaullv@gmail.com>
Date:   Sat Aug 24 22:39:31 2013 +0200

    Bluetooth: CA translations

    Change-Id: I964ec1df90f7c8cce944ae336738d94b7518e4af

commit e0c1a50bc70373f65983545572cf3953eeffa625
Author: Hemant Gupta <hemantg@codeaurora.org>
Date:   Tue Jul 30 16:15:20 2013 +0530

    Bluetooth: HID : Add support for Set Idle and Get Idle commands

    This patch adds support for Get Idle and Set Idle command handling
    in jni and HidService which will be used to provide interface for
    sending thse commands to HID Remote device.

    Change-Id: I066d47c022905a39c11d365a9d26d128f94fe2f6
    CRs-Fixed: 522511

commit 4f52424fe319187d4df021a1540a5f45c02894ca
Author: Chi Tung Li <tonyli1357@gmail.com>
Date:   Wed Aug 21 23:53:35 2013 +0800

    Bluetooth: zh-TW translations

    Change-Id: I21e142a185fc1a0a922733d20a9d240359495506

commit 4faeb8c1f0b3e6bd70a102ba9c73b12e285218a6
Merge: f11668e b9d6b7f
Author: Steve Kondik <shade@chemlab.org>
Date:   Sun Aug 18 01:37:22 2013 -0700

    Merge branch 'jb_mr2' of git://codeaurora.org/platform/packages/apps/Bluetooth into cm-10.2

commit b9d6b7fd4162f077236d8b5d5fd6e1c2dbe7c41b
Merge: 048abad 4ea367a
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Aug 14 05:23:23 2013 -0700

    Merge "Bluetooth: Send pairing cancel intent only if pairing in progress"

commit 048abad23895e61d518146b7b12cb9283bf10e46
Merge: 81a7621 69c9ec9
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Aug 14 05:22:32 2013 -0700

    Merge "Bluetooth: Query BluetoothPhoneService at BT ON."

commit f11668eec5edab56d427bc102b0e45cbade4036e
Merge: 40d9e2f c5987d2
Author: Steve Kondik <shade@chemlab.org>
Date:   Mon Aug 12 11:46:23 2013 -0700

    Merge branch 'jb_mr2' of git://codeaurora.org/platform/packages/apps/Bluetooth into cm-10.2

commit 4ea367a4383a1fb12238c2859706df304ebc069e
Author: Smriti Gupta <smritig@codeaurora.org>
Date:   Mon Jul 29 16:43:44 2013 +0530

    Bluetooth: Send pairing cancel intent only if pairing in progress

    This patch sends pairing cancel intent on acl disconnetion only if
    pairing is in progress. Without this patch, in case there was an
    ongoing pairing while acl disconnect is received for some other
    device, ongoing pairing was getting cancelled un-intentionally due
    to side-effects caused by dbff9ae0ebdcdf63db6c125331002dbb6f50f953

    Change-Id: I859f79a8b7f196fe7617419dbbd6284a47228700
    CRs-Fixed: 508911

commit 81a7621db84deafdad1d01e5d272a98d1a52509b
Merge: c5987d2 7f7384a
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Aug 12 09:24:13 2013 -0700

    Merge "Bluetooth: Send proper track number"

commit 7f7384ab042d647bb4909f133d5dcc453c2b39f8
Author: Rohit Singh <singhr@codeaurora.org>
Date:   Mon Aug 12 14:21:26 2013 +0530

    Bluetooth: Send proper track number

    As per specification
    RegisterNotification - If no track is currently selected
    then return 0xFFFFFFFFFFFFFFFF in the interim response.
    Changes are made to ensure return above value if play state
    is not playing.

    Change-Id: Ib27eeeb65fe6659178658e58eb8f875168b236df
    CRs-Fixed: 519337

commit c5987d223415f2a266d8235c3b69b74f5fd5052b
Merge: b168775 cb5e2cf
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Aug 7 01:47:01 2013 -0700

    Merge "Bluetooth: Update the roam status."

commit 40d9e2f39cfddeffa94d319671517ac3bdc6aac8
Merge: 147309a 33120f9
Author: Danny Baumann <dannybaumann@web.de>
Date:   Tue Aug 6 18:26:25 2013 +0000

    Merge "Send out a broadcast intent when BT voice dialing is shut down." into cm-10.2

commit 33120f9dbb0bda7f6581592199ed0406dbb2f06b
Author: Danny Baumann <dannybaumann@web.de>
Date:   Fri Dec 21 10:30:46 2012 +0100

    Send out a broadcast intent when BT voice dialing is shut down.

    This broadcast can be used by voice dialing applications to stop
    themselves.

    Change-Id: Ia9f5b6bc4cbfd18bddc40f98170463b613a9c329

commit 147309ae2495e409f6662d94b992b4b278bd703b
Author: Jo De Boeck <deboeck.jo@gmail.com>
Date:   Fri Aug 2 18:19:21 2013 +0200

    AVRCP: Make artist metadata come from ARTIST and fallback to ALBUMARTIST

    Makes artist appear on bluetooth device when music player only sents
    artist (Apollo does this)

    Change-Id: I75ca5515d0f20fc647e8d55a339610a7d5dbeba1

commit b1687752cc15de043cbdc50a00e07eece168730e
Merge: 65f1148 833a03f
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Aug 2 05:46:25 2013 -0700

    Merge "Bluetooth: Added  Shared Preferences to restore tethering setting"

commit 65f11482a88567816c72d48cbbe975a270712cfb
Merge: ba3a7b1 a4c116b
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Aug 1 10:10:22 2013 -0700

    Merge "Bluetooth: set apk format as acceptable shareinbound types."

commit ba3a7b187797ca40f4d3047ba189ce67264628c0
Merge: 218005e e3d5723
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Aug 1 10:10:11 2013 -0700

    Merge "Revert "Bluetooth: Fix to update mTetherOn with proper value.""

commit a4c116b9e38acd662671618f631365a8849d6818
Author: Smriti Gupta <smritig@codeaurora.org>
Date:   Mon Jul 22 15:30:04 2013 +0530

    Bluetooth: set apk format as acceptable shareinbound types.

    Adding apk format as a acceptable inbound types ,to be able
    to receive these file formats from remote device.

    Change-Id: I5175b634b88418b0d5c9baaedb84a48fe0d97357
    CRs-fixed: 497427

commit 833a03f1f3c7e593edb52e2063ff852381e2fc67
Author: Bhasker Neti <bneti@codeaurora.org>
Date:   Thu Aug 1 00:35:22 2013 +0530

    Bluetooth: Added  Shared Preferences to restore tethering setting

    Added a Shared Preferences to have the tethering setting persist,
    so that during the BT on/off the value can be restored and based
    on the value tethering settings will be restored/altered.

    CRs-fixed: 506194
    Change-Id: I3fffbb78712f4177178531c6c202b786bfcd9d39

commit e3d5723a9c803c80354d2843f79baa27b5735fc5
Author: Bhasker Neti <bneti@codeaurora.org>
Date:   Thu Aug 1 11:37:10 2013 +0530

    Revert "Bluetooth: Fix to update mTetherOn with proper value."

    This reverts commit 649ef29479c35ca92194868b4721c469b9142291.

    Revert "Bluetooth: Added a property to have the tethering setting persist"

    This reverts commit 205cd5db88e30bc8a7cfdfe959f58cf4e0d9c3c3.
    This is is a combination of 2 commits.

    Changed  the implementation via
    Change-Id: Ifbe1bc4909d259e7e8e6e9801b28d974f38c5354

commit 218005e476e5645bdb6782859ae56d69838b6942
Merge: d954826 649ef29
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Jul 31 18:30:03 2013 -0700

    Merge "Bluetooth: Fix to update mTetherOn with proper value."

commit 649ef29479c35ca92194868b4721c469b9142291
Author: Nitin Shivpure <nshivpur@codeaurora.org>
Date:   Tue Jul 30 18:36:59 2013 +0530

    Bluetooth: Fix to update mTetherOn with proper value.

    As the mTetherOn indicates, whether bluetooth tethering
    is on/off. So incoming pan(DUT as NAP Role) connection
    is only accepted, if mTetherOn is set true. So mTetherOn
    should be updated with proper value.

    Change-Id: I31cfe4e3f3b7fd2ed1f970418f28286100d29514
    CRs-fixed: 506194

commit cb5e2cf6e97589cc3c25ed5a0c34f5f68cb1e348
Author: Nitin Srivastava <nitinsr@codeaurora.org>
Date:   Fri Jul 26 12:43:06 2013 +0530

    Bluetooth: Update the roam status.

    This change makes sure that roam status
    change is updated to headset immediately
    instead of updating at network service state
    changed.

    CRs-Fixed: 503919
    Change-Id: Ia5c68e2158241459f48a1718689361ad0cd6fbf8

commit 69c9ec9e331fb9e84853f57caca246f7e1f34750
Author: Nitin Srivastava <nitinsr@codeaurora.org>
Date:   Thu Apr 4 16:53:17 2013 +0530

    Bluetooth: Query BluetoothPhoneService at BT ON.

    This will allow the application to have
    updated values of call states.

    CRs-fixed: 506853
    Change-Id: I0b1e9cdfd7ecac05062c82aa563849f49a5ae520

commit d954826ba5f59faeb9009b248927d73d6210294e
Merge: 736751d 67de715
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jul 29 19:57:06 2013 -0700

    Merge "Merge commit 'android-4.3_r2.1' into merge_branch"

commit 736751d403d26480d37327562168d3efc143bfaf
Merge: 0f8186a 205cd5d
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Jul 26 12:19:23 2013 -0700

    Merge "Bluetooth: Added a property to have the tethering setting persist"

commit 205cd5db88e30bc8a7cfdfe959f58cf4e0d9c3c3
Author: Bhasker Neti <bneti@codeaurora.org>
Date:   Mon Jul 8 14:24:23 2013 +0530

    Bluetooth: Added a property to have the tethering setting persist

    Added a property to have the tethering setting persist, so that
    in the BT on/off the value can be restored and based on the value
    tethering settings will be restored/altered.

    Change-Id: I814641b2150377838d55378ff06b5cd80343b35f
    CRs-fixed: 506194

commit 67de715af4c43a4b9aa1fea620bcd641b21bb65a
Merge: 0f8186a 7dc55aa
Author: Shruthi Krishna <skrish@codeaurora.org>
Date:   Thu Jul 25 15:11:20 2013 -0700

    Merge commit 'android-4.3_r2.1' into merge_branch

    * commit 'android-4.3_r2.1':
      ignore invlaid play position update from remote control client.

commit 7dc55aab7b1e53f784ffc75d1e7e28c0ee42bb0c
Merge: 865b323 f56b7b3
Author: Zhihai Xu <zhihaixu@google.com>
Date:   Tue Jun 11 19:39:49 2013 +0000

    Merge "ignore invlaid play position update from remote control client." into jb-mr2-dev

commit f56b7b37a156d9207074af80c156db5884bb8c08
Author: Zhihai Xu <zhihaixu@google.com>
Date:   Fri Jun 7 18:12:21 2013 -0700

    ignore invlaid play position update from remote control client.

    differentiate between applications that use
     the new RemoteControlClient APIs to pass a playback position but
     don't have one yet, and applications that use the legacy API and
     will never pass a position.

    bug:9294855
    Change-Id: I015b9ded72497464352a9fbb6a605cedfffad373

Change-Id: Ic1ac27fd3018e70eb4395b95051449d5570ea9f8