Squashed commit of the following:

commit 0839ae958f8e883e77aae14323a31e98a14e0c00
Author: Matthew Xie <mattx@google.com>
Date:   Thu May 9 11:28:57 2013 -0700

    Turn off BLE, GATT, and SMP of Bluetooth stack

    bug 8664724

    Change-Id: I9410f0e8049a0c01bd84dcb54bfc3b02519f0a10

commit b08d95e4f4b727a8bcf49db8a2198c18ee0c6919
Merge: 509af63 bd0f230
Author: The Android Automerger <android-build@android.com>
Date:   Mon Apr 15 05:55:19 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit 509af6374155c70ac757664e7d81d2a6c38703eb
Author: Ken Sumrall <ksumrall@android.com>
Date:   Wed Apr 10 20:48:12 2013 -0700

    Remove deprecated recovery.fstab

    Change-Id: Ia8ae3e37a0855f6b4aa4e8f900a8731d3b537132

commit bd0f230db16f0b5b5b30b239942faa6f216cc7da
Merge: d8f789c 2ed1ced
Author: The Android Automerger <android-build@android.com>
Date:   Wed Mar 27 05:55:17 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit d8f789c576d8a6ffe44fdad6056f471210e8a32a
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Mar 22 15:53:57 2013 -0700

    Rename AOSP builds to aosp_*

    Change-Id: I9c3221a4a4c2d4b0ab6a846777c347bf865b1e42

commit 2ed1ced511e7e4b341b5fcbc7fdbb4c06ca00627
Author: Wink Saville <wink@google.com>
Date:   Tue Mar 19 16:03:41 2013 -0700

    Bump apns version to 8

    apns*.xml files must all match the version in
    frameworks/base/core/res/res/xml/apns.xml
    which is now 8.

    Bug: 8415842
    Change-Id: I69f7d1f6bcbd0202481a5e50c9912e4efffbce2f

commit bb4da9f62ae6ba34005c88a8418b1220674fd190
Author: Wink Saville <wink@google.com>
Date:   Tue Mar 19 16:03:41 2013 -0700

    Bump apns version to 8

    apns*.xml files must all match the version in
    frameworks/base/core/res/res/xml/apns.xml
    which is now 8.

    Bug: 8415842
    Change-Id: I69f7d1f6bcbd0202481a5e50c9912e4efffbce2f

commit 64b281c4f91b58941d3549434efc571acba735f6
Merge: d515a4f 292d712
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Feb 20 08:59:00 2013 -0800

    am 292d712d: New date code

    * commit '292d712d2196d5d88aee76d3d724dedc942aa502':
      New date code

commit 292d712d2196d5d88aee76d3d724dedc942aa502
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Feb 20 08:54:44 2013 -0800

    New date code

    Change-Id: Ieee7e81ac074cf40a90c19266a9ec38a778ec0d1

commit d515a4f214c35330b3ca9e37f1a8a0feb8cf7a7d
Merge: e9b1870 f32ec4c
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Feb 19 14:40:47 2013 -0800

    am f32ec4c9: More reformatting for uniformity

    * commit 'f32ec4c9e62d2a8f27299807ba70ca29d98b3af2':
      More reformatting for uniformity

commit f32ec4c9e62d2a8f27299807ba70ca29d98b3af2
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Feb 19 14:36:20 2013 -0800

    More reformatting for uniformity

    Change-Id: I054c705f92748d1784864aa6956ac069f9e0eb29

commit e9b18708778c86783a656960e30a7c225f1de4bc
Merge: 21ec914 365a408
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Feb 15 21:07:33 2013 -0800

    am 365a4082: Re-format for uniformity with other licenses

    * commit '365a4082aceefbfe6ea4b8a2b76fab76d9513779':
      Re-format for uniformity with other licenses

commit 365a4082aceefbfe6ea4b8a2b76fab76d9513779
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Feb 15 21:03:02 2013 -0800

    Re-format for uniformity with other licenses

    Change-Id: I2541c908b6056a900bd957c40da615a4ea2a16f7

commit 21ec9149f951c26657e52a72d79dfc28e7105f25
Merge: 3444170 0d24a14
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Feb 15 20:29:43 2013 -0800

    am 0d24a14f: Remove stray whitespace

    * commit '0d24a14fd69b13e182005211deecfda6c2e40b64':
      Remove stray whitespace

commit 0d24a14fd69b13e182005211deecfda6c2e40b64
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Feb 15 20:24:37 2013 -0800

    Remove stray whitespace

    Change-Id: I36a6ab750d52416121fee07ef1edf83ad877419a

commit 3444170a06e2fdec162c3c220d29ce43076a2f68
Merge: 1bd80a0 b765499
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Feb 15 20:15:09 2013 -0800

    am b765499f: Reformat licences to a uniform 77-column format

    * commit 'b765499f0b4ed710964c4700418ad63ace83f360':
      Reformat licences to a uniform 77-column format

commit b765499f0b4ed710964c4700418ad63ace83f360
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Feb 15 20:09:49 2013 -0800

    Reformat licences to a uniform 77-column format

    Change-Id: Iea4c10f667be9f5c5c32b68c350c1d4b966de7f5

commit 1bd80a0417851cd92bc20cb0f61dcb972227469e
Merge: 25fd25c 7fbcd5d
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Dec 28 13:10:03 2012 -0800

    am 7fbcd5d9: Generate new set of toroplus binaries

    * commit '7fbcd5d93194073b797869b567141c5b24d3c23c':
      Generate new set of toroplus binaries

commit 7fbcd5d93194073b797869b567141c5b24d3c23c
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Dec 28 10:13:24 2012 -0800

    Generate new set of toroplus binaries

    Change-Id: I36e66a8c4d60244c9aec9d04254ebf28d4c44d8e

commit 25fd25c0b63816cd373bde334b813306422ce1ae
Merge: af18af2 d0a87f3
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Nov 12 17:37:42 2012 -0800

    am d0a87f30: Toroplus self-extractors for JOP40C

    * commit 'd0a87f30bf69f5957c9bf9a6f27bb9495e7b522e':
      Toroplus self-extractors for JOP40C

commit d0a87f30bf69f5957c9bf9a6f27bb9495e7b522e
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Nov 12 13:31:17 2012 -0800

    Toroplus self-extractors for JOP40C

    Change-Id: I7920c4350278547246f06b975ab5079aea082950

commit af18af27defc5314a8ceeab24d4bbdd3a06e9d05
Merge: f22d8c7 03f010e
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Nov 8 09:42:37 2012 -0800

    am 03f010e4: Fix build - can\'t override a variable that doesn\'t exist

    * commit '03f010e4744d51ff81b44de2fe88d9a4c61e7cf9':
      Fix build - can't override a variable that doesn't exist

commit 03f010e4744d51ff81b44de2fe88d9a4c61e7cf9
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Nov 8 09:39:28 2012 -0800

    Fix build - can't override a variable that doesn't exist

    Change-Id: Ib615ada60a99df0fdc8df4fbea8aa73825619486

commit f22d8c7a99fffd6022fa7476e7f362781e26c636
Merge: bd4b292 b2e9997
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Nov 6 16:00:21 2012 -0800

    am b2e99976: am 2300b082: Merge "1) Using Sprint-specific apns-conf.xml (/system/etc/apns-conf.xml)"

    * commit 'b2e99976690e5ea18c787bcda6697fe94d8a7493':
      1) Using Sprint-specific apns-conf.xml (/system/etc/apns-conf.xml)

commit b2e99976690e5ea18c787bcda6697fe94d8a7493
Merge: 89fbc7d 2300b08
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Nov 6 15:55:31 2012 -0800

    am 2300b082: Merge "1) Using Sprint-specific apns-conf.xml (/system/etc/apns-conf.xml)"

    * commit '2300b0828e8cf35731094abdee0b9d07b16b8dc3':
      1) Using Sprint-specific apns-conf.xml (/system/etc/apns-conf.xml)

commit 2300b0828e8cf35731094abdee0b9d07b16b8dc3
Merge: 4e8ba13 e16f1ef
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Nov 6 14:28:06 2012 -0800

    Merge "1) Using Sprint-specific apns-conf.xml (/system/etc/apns-conf.xml)"

commit e16f1efedb011d7b2d948463181e76bf486ea4aa
Author: Peter Syromiatnikov <peter.s.syromiatnikov@sprint.com>
Date:   Wed Oct 24 15:17:03 2012 -0500

    1) Using Sprint-specific apns-conf.xml (/system/etc/apns-conf.xml)

    2) Added overlay for Settings to enable "Additional updates" section (Update profile, Update PRL)

    Change-Id: I091415ba988b0ab70289bc1e9f4b912f84cc4073

commit bd4b2922ef8b1642a47e424d72118c934507be38
Merge: 3304ba5 89fbc7d
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Oct 11 17:54:28 2012 -0700

    am 89fbc7d1: am 4ea2e8d3: am 85dbec4a: am 520b5710: Licence for NXP binaries

    * commit '89fbc7d14e617a34e8b048fde0f122b8200fb32c':
      Licence for NXP binaries

commit 89fbc7d14e617a34e8b048fde0f122b8200fb32c
Merge: 1205123 4ea2e8d
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Oct 11 17:11:57 2012 -0700

    am 4ea2e8d3: am 85dbec4a: am 520b5710: Licence for NXP binaries

    * commit '4ea2e8d35246ae07e6f26614a53e5132841bd9ff':
      Licence for NXP binaries

commit 3304ba5804188da90fb015e6f5ced14010d4552e
Merge: 3f24449 1205123
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Oct 3 15:27:25 2012 -0700

    am 1205123e: (-s ours) am 4e8ba13e: (-s ours) Reconcile with jb-dev - do not merge

    * commit '1205123e40fa563ba42c953294a291bba3f62820':

commit 1205123e40fa563ba42c953294a291bba3f62820
Merge: 7d4be2d 4e8ba13
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Oct 3 15:25:14 2012 -0700

    am 4e8ba13e: (-s ours) Reconcile with jb-dev - do not merge

    * commit '4e8ba13e1ba1a8876b254def2c889b507332b608':

commit 4e8ba13e1ba1a8876b254def2c889b507332b608
Merge: 452d9e3 4197904
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Oct 3 15:23:40 2012 -0700

    Reconcile with jb-dev - do not merge

    Change-Id: I279cb59abafe23786bc22470b5aac06cc3d93f2c

commit 3f24449b5c792b88c55be8c9b9e5b9ea70c06ad7
Merge: 5639699 7d4be2d
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Oct 2 14:01:15 2012 -0700

    am 7d4be2d2: am 9a68c6fc: am f877dad9: am 41979049: JZO54K self-extractors for toroplus

    * commit '7d4be2d28260b49acf5516f6a930144c9be3c5da':
      JZO54K self-extractors for toroplus

commit 7d4be2d28260b49acf5516f6a930144c9be3c5da
Merge: caa10a3 9a68c6f
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Oct 2 13:59:29 2012 -0700

    am 9a68c6fc: am f877dad9: am 41979049: JZO54K self-extractors for toroplus

    * commit '9a68c6fc3ea3fb360ec23152ed13309d8ad842c0':
      JZO54K self-extractors for toroplus

commit 563969986417947ebf75116a5559ad09d6ad5007
Merge: 2d7097f caa10a3
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Oct 1 17:26:49 2012 -0700

    am caa10a3c: am 33cf8879: Auto-generated toroplus blob list

    * commit 'caa10a3c1a92bdaa1488d06c76fac9f340f66642':
      Auto-generated toroplus blob list

commit caa10a3c1a92bdaa1488d06c76fac9f340f66642
Merge: af729a9 33cf887
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Oct 1 17:22:07 2012 -0700

    am 33cf8879: Auto-generated toroplus blob list

    * commit '33cf887992e31fb242a84fb61071cadbba26b898':
      Auto-generated toroplus blob list

commit 2d7097f44feb4295882abbb4e73a9e9d051aeeb0
Merge: d500dd8 af729a9
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Sep 28 10:58:32 2012 -0700

    am af729a99: am fc6d9c57: am 06fba2bf: resolved conflicts for merge of 2e537299 to jb-dev-plus-aosp

    * commit 'af729a99ef77f4bb36bdd8cca2f2c240766c7d2b':
      Update blob list, add matching self-extractors

commit af729a99ef77f4bb36bdd8cca2f2c240766c7d2b
Merge: 762c9f3 fc6d9c5
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Sep 28 10:56:47 2012 -0700

    am fc6d9c57: am 06fba2bf: resolved conflicts for merge of 2e537299 to jb-dev-plus-aosp

    * commit 'fc6d9c57b10ed1445360eed87deedaa4e4734f38':
      Update blob list, add matching self-extractors

commit d500dd83a65ea2bc86b4914a7042a9927fb05b04
Merge: ebb0f5e 762c9f3
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Sep 28 10:50:46 2012 -0700

    am 762c9f34: am 5e5272a4: auto-generated blob list

    * commit '762c9f348c411bf21e864cb856049d894e81ec0f':
      auto-generated blob list

commit 762c9f348c411bf21e864cb856049d894e81ec0f
Merge: 28b7874 5e5272a
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Sep 28 10:49:02 2012 -0700

    am 5e5272a4: auto-generated blob list

    * commit '5e5272a43eb0bbcdcae264362beecafc03234c4b':
      auto-generated blob list

commit ebb0f5e737d70934cbe79ab777d1caa247f64e72
Merge: d86b4d3 28b7874
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Sep 28 09:25:39 2012 -0700

    am 28b78745: am 452d9e3b: Generate toroplus factory images

    * commit '28b78745210509562ff8fc51e0f27d5bc0d9d70e':
      Generate toroplus factory images

commit 28b78745210509562ff8fc51e0f27d5bc0d9d70e
Merge: 1f7fa15 452d9e3
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Sep 28 09:23:50 2012 -0700

    am 452d9e3b: Generate toroplus factory images

    * commit '452d9e3b71fa9edbb113363b723716eae5dc1da2':
      Generate toroplus factory images

commit 452d9e3b71fa9edbb113363b723716eae5dc1da2
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Sep 7 09:35:25 2012 -0700

    Generate toroplus factory images

    Change-Id: I0dcfc62edc35329a47e4cd1f81bd7ae100cd61a7

commit d86b4d31387d9cb79c865fea099416e7ff589827
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Sep 26 18:59:39 2012 -0700

    auto-generated blob list

    Bug: 4295425
    Change-Id: I2b6c4e659f8f3c2174b181ea5e7eeb03326f3d77

Change-Id: Ic9c2382c7c9ed8667334a8dd44bcc355a839a864