Squashed commit of the following:

commit b40835e5ba7c62565499a87ee0e2b8663e2fb1b2
Author: Matthew Xie <mattx@google.com>
Date:   Wed May 8 19:06:32 2013 -0700

    Turn off BLE, GATT, and SMP of Bluetooth stack

    bug 8664724

    Change-Id: I3ef91349cce5bcd0323690e9be0835e07dbd9f28

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

    Remove deprecated recovery.fstab

    Change-Id: If7089a2ffe6ac0bffe3ee79c2269c0c73775dd8a

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

    Rename AOSP builds to aosp_*

    Change-Id: I5c12171e585dfc11561a8d639d0d8e2463531deb

commit 490d6c7f3828cfd0da4bc3db58b8d5d2f47d5389
Author: Mathias Agopian <mathias@google.com>
Date:   Wed Mar 20 18:54:21 2013 -0700

    set ro.bq.gpu_to_cpu_unsupported properly

    Change-Id: Ia4b9433fc9b31d23859b7a3b24e0a42fb81b2441

commit 76a2cf60057c51ebe08bc06c24d088ae66f6b7a6
Merge: 4a48079 769e3ad
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Feb 20 08:51:17 2013 -0800

    am 769e3ad3: Self-extractors for JDQ39

    * commit '769e3ad39a9d429d6b968d2d58740559d766ffc6':
      Self-extractors for JDQ39

commit 769e3ad39a9d429d6b968d2d58740559d766ffc6
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Feb 19 15:30:52 2013 -0800

    Self-extractors for JDQ39

    Change-Id: I9d485569c7ce1c4261f1ec4b8fa4922678cc133a

commit 4a48079da361ff273ff3855dd6f4666149a40195
Merge: 15f2be1 70fe736
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Feb 19 14:37:20 2013 -0800

    am 70fe7366: More reformatting for uniformity

    * commit '70fe7366dfd5b9ddf85dbfb18dd9ccfd8194a40e':
      More reformatting for uniformity

commit 70fe7366dfd5b9ddf85dbfb18dd9ccfd8194a40e
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Feb 19 14:34:02 2013 -0800

    More reformatting for uniformity

    Change-Id: I627beecb3a78c5b37cbc3b6d1d757feadcd2b4b3

commit 15f2be1f5271c66fe0b5966f1d063402b86e8fa7
Merge: 5461ecd acb3b61
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Feb 15 21:07:33 2013 -0800

    am acb3b610: Re-format for uniformity with other licenses

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

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

    Re-format for uniformity with other licenses

    Change-Id: I94182d55a74fa5cea3a82927cbcc32d77ca780b1

commit 5461ecdd12925d8ad59a40c34c157a731a1cd1f9
Merge: ff2839a 191cfb4
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Feb 15 20:22:58 2013 -0800

    am 191cfb4a: Remove stray whitespace

    * commit '191cfb4ae7c54ccff0e22b042f321363d3b9abb0':
      Remove stray whitespace

commit 191cfb4ae7c54ccff0e22b042f321363d3b9abb0
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Feb 15 20:20:33 2013 -0800

    Remove stray whitespace

    Change-Id: Ibb5ac951a51e5c40f83ff0ae26aa9e47a0a75cda

commit ff2839aa33ecb24c9809cdf3c66a09c16e5a4e25
Merge: 2549cfd c32db18
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Feb 15 20:08:19 2013 -0800

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

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

commit c32db1813910893a923f281637e0ffc85e264f98
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Feb 15 19:22:54 2013 -0800

    Reformat licences to a uniform 77-column format

    Change-Id: Id90b655735daced4ced2346dc2c59daf05cb3151

commit 2549cfd11321daa428b49b4024486e9743cf9ea0
Merge: 2ca8863 caad00e
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Feb 14 09:34:37 2013 -0800

    am caad00e0: Factory images for JDP39

    # Via Jean-Baptiste Queru
    * commit 'caad00e0bc27cefdf867b82cde11a0494bc170a6':
      Factory images for JDP39

commit caad00e0bc27cefdf867b82cde11a0494bc170a6
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Feb 14 08:37:58 2013 -0800

    Factory images for JDP39

    Change-Id: I5a461b7f26e18605b9b6bda53f55d77f2dc265f2

commit 2ca886365f70711cc7a39e3bdd27c8e42a1b88d5
Merge: 3864a47 3cc162a
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Dec 28 09:48:54 2012 -0800

    am 3cc162a0: Packages for JDP82

    * commit '3cc162a0a9d16691c3f4cb9785c42a64af9452bb':
      Packages for JDP82

commit 3cc162a0a9d16691c3f4cb9785c42a64af9452bb
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Dec 27 09:30:07 2012 -0800

    Packages for JDP82

    Change-Id: I57ffdd303a092f4a20bb6fd40255bac4001e3cca

commit 3864a47ce9f3c72d92f9adce55b638312eca96e2
Merge: 5c6380d 42d1c34
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Nov 29 09:49:42 2012 -0800

    am 42d1c34c: JOP40D factory images for Maguro

    * commit '42d1c34cfba7f98c7d31930369e2417235c45230':
      JOP40D factory images for Maguro

commit 42d1c34cfba7f98c7d31930369e2417235c45230
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Nov 28 13:38:04 2012 -0800

    JOP40D factory images for Maguro

    Change-Id: I13cf656e4c88007aefe1df03a178806415520db4

commit 5c6380dff59beca019defec1e214716fd736e12c
Merge: 2b523a8 3c82b2c
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Nov 12 08:58:36 2012 -0800

    am 3c82b2c0: Maguro factory images for JOP40C

    * commit '3c82b2c0542f16762ea56bfd6f11fb139a1f791c':
      Maguro factory images for JOP40C

commit 3c82b2c0542f16762ea56bfd6f11fb139a1f791c
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Nov 12 08:50:58 2012 -0800

    Maguro factory images for JOP40C

    Change-Id: I867bec358f46ec0713547bbf4f2548b3c9f8e3b9

commit 2b523a84bcbb841b20a2c250077fd0f124c4b6bc
Merge: 70e7d91 60cb8be
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Nov 12 08:40:14 2012 -0800

    am 60cb8be8: Maguro self-extractors for JOP40C

    * commit '60cb8be8d22bdefbaf439685b3ba0be6ef97ce04':
      Maguro self-extractors for JOP40C

commit 60cb8be8d22bdefbaf439685b3ba0be6ef97ce04
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Nov 12 08:28:32 2012 -0800

    Maguro self-extractors for JOP40C

    Change-Id: I59b57772a6eb38cff0c5d571486fa230dfcc710b

commit 70e7d9190fe87e4e70ed6db928fcf63d28be92b6
Merge: b73e302 7d97504
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Nov 9 22:44:18 2012 -0800

    am 7d97504f: Merge "Maguro binaries for JOP40" into stage-aosp-master

    * commit '7d97504f30277acd0d71f3d814ce9f80aa69f7e4':
      Maguro binaries for JOP40

commit b73e302fcaf23991df6e61fd5e8c72a5898c7eef
Merge: df7ba9f 0cd370c
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Nov 9 22:44:17 2012 -0800

    am 0cd370c9: Maguro factory images for JOP40

    * commit '0cd370c93f1e2e99c3538424052ce86a4ef4d3d0':
      Maguro factory images for JOP40

commit 7d97504f30277acd0d71f3d814ce9f80aa69f7e4
Merge: 0cd370c d1af22a
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Nov 9 15:16:16 2012 -0800

    Merge "Maguro binaries for JOP40" into stage-aosp-master

commit d1af22a39d628a446a982a6d06684df6e376a1c2
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Nov 9 13:11:10 2012 -0800

    Maguro binaries for JOP40

    Change-Id: Ic3cbb409edd911bed4083a419f2c9d5e2cbf33f6

commit 0cd370c93f1e2e99c3538424052ce86a4ef4d3d0
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Nov 9 12:59:45 2012 -0800

    Maguro factory images for JOP40

    Change-Id: I482688052e62e8c6c1bc98df1d13a00ec75c06c6

commit df7ba9f1bf28844506ec952720576a24a3ff092a
Merge: c8f49a4 1dc08fb
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Nov 9 11:34:15 2012 -0800

    am 1dc08fb8: Maguro factory images for JOP39B

    * commit '1dc08fb813085999d58f6c07b57b4422238a8fd7':
      Maguro factory images for JOP39B

commit 1dc08fb813085999d58f6c07b57b4422238a8fd7
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Nov 9 08:30:38 2012 -0800

    Maguro factory images for JOP39B

    Change-Id: Ib28fb3191813aac333d9b9173618db3804e27d81

commit c8f49a4475924d80107e048901adce819278c28a
Merge: 755fe56 3fa5d72
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Nov 6 09:55:08 2012 -0800

    am 3fa5d72d: Maguro self-extractors for JOP36

    * commit '3fa5d72d9ea7eb7b35e1585a50aaa02b476194ef':
      Maguro self-extractors for JOP36

commit 3fa5d72d9ea7eb7b35e1585a50aaa02b476194ef
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Nov 6 09:19:16 2012 -0800

    Maguro self-extractors for JOP36

    Change-Id: Ifc79090441083bae3d400a0f69c7bcc63b41f548

commit 755fe566c3b4b46d0d0e34653e849b50320016d8
Merge: e8fb6db d1d3683
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Nov 2 15:05:23 2012 -0700

    am d1d3683d: Update maguro self-extractors for JOB32B

    * commit 'd1d3683d4782bcda3ed26101c0b6e483c82a6764':
      Update maguro self-extractors for JOB32B

commit d1d3683d4782bcda3ed26101c0b6e483c82a6764
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Nov 2 14:20:13 2012 -0700

    Update maguro self-extractors for JOB32B

    Change-Id: I15aceb45768794e994a150957be6d0a1e8c52466

commit e8fb6db5a26f6b53ec5be4582336ad9944336979
Merge: 8d62a33 9aef5c2
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Oct 11 17:16:02 2012 -0700

    am 9aef5c24: am 703c87d0: am c93fe3ee: auto-generated blob list

    * commit '9aef5c242429403a424198d6ed97ec774f1904cc':
      auto-generated blob list

commit 8d62a3338ab5533cf70e36c2ed9c5fc0343435cb
Merge: 9a6d4a7 18c6939
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Oct 11 17:16:01 2012 -0700

    am 18c6939b: am 4c1e7962: auto-generated blob list

    * commit '18c6939b84363844503bab0a88a7409e2b74a0af':
      auto-generated blob list

commit 9aef5c242429403a424198d6ed97ec774f1904cc
Merge: 18c6939 703c87d
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Oct 11 17:10:21 2012 -0700

    am 703c87d0: am c93fe3ee: auto-generated blob list

    * commit '703c87d0de2fdfc9f5535bc23a8739cd2109ea4c':
      auto-generated blob list

commit 18c6939b84363844503bab0a88a7409e2b74a0af
Merge: 0fb51b2 4c1e796
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Oct 11 17:10:20 2012 -0700

    am 4c1e7962: auto-generated blob list

    * commit '4c1e79627bd24d07a6ddbeb4f9381688a69f2987':
      auto-generated blob list

commit 9a6d4a77f9bb7d0e791cd3ddc7938e2295f93ecc
Merge: 5001fb6 0fb51b2
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Oct 11 12:28:48 2012 -0700

    am 0fb51b2f: am 8bc8d926: License for NXP binaries

    * commit '0fb51b2fdcf6e9680610df6fc61dbf53971f2ea5':
      License for NXP binaries

commit 0fb51b2fdcf6e9680610df6fc61dbf53971f2ea5
Merge: 834ce28 8bc8d92
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Oct 11 12:26:37 2012 -0700

    am 8bc8d926: License for NXP binaries

    * commit '8bc8d9260ae952f2c27a89a8d6f20986a120c50f':
      License for NXP binaries

commit 8bc8d9260ae952f2c27a89a8d6f20986a120c50f
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Oct 11 10:00:54 2012 -0700

    License for NXP binaries

    Change-Id: I3826efb2d9df0afecc5357a51c391a5d7ccfd42e

commit 703c87d0de2fdfc9f5535bc23a8739cd2109ea4c
Merge: 4c1e796 c93fe3e
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Oct 11 09:52:57 2012 -0700

    am c93fe3ee: auto-generated blob list

    * commit 'c93fe3ee8e58c2dbd27b1f82a7dfdc7b040e4244':
      auto-generated blob list

commit 4c1e79627bd24d07a6ddbeb4f9381688a69f2987
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Oct 11 02:57:51 2012 -0700

    auto-generated blob list

    Bug: 4295425
    Change-Id: I48fc47771df0a8737069e879683bfd2bb71b9446

commit 5001fb6825f38c0e8d9f66535e01df0ed0f6b5c1
Merge: ff46ccf 834ce28
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Oct 3 11:26:33 2012 -0700

    am 834ce287: resolved conflicts for merge of 0f2c53e4 to jb-mr1-dev-plus-aosp

    * commit '834ce287666bf5809dc5be5c4b2a481f21fa7901':
      Distributables for JZO54K for maguro

commit 834ce287666bf5809dc5be5c4b2a481f21fa7901
Merge: bf5faac 0f2c53e
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Oct 3 11:22:41 2012 -0700

    resolved conflicts for merge of 0f2c53e4 to jb-mr1-dev-plus-aosp

    Change-Id: Ib2ccea0895a773aadc09d96cacf119d5c97eed9a

commit 0f2c53e45841fd3f2ef3a5a26a4525392b3d4a58
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Oct 3 08:33:15 2012 -0700

    Distributables for JZO54K for maguro

    Change-Id: If93b31632bec783efebcbe819cb2fc21ae2e2791

commit ff46ccfa5cf1e16d280843c31a4d0b95ed700d96
Merge: bb5e72a bf5faac
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Sep 28 15:52:08 2012 -0700

    am bf5faaca: Merge from jb-mr1-aah-dev

    * commit 'bf5faacaebf3e6e87181b3a65f1b8a60976eb6d6':

commit bf5faacaebf3e6e87181b3a65f1b8a60976eb6d6
Merge: 1c1e54c 8bb850a
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Sep 28 14:21:38 2012 -0700

    Merge from jb-mr1-aah-dev

    Change-Id: I690b2e7bf9a06fa53fd6fc922f619b6a0020d158

commit bb5e72a0e3e05a546113220b073f5662f25feb61
Merge: 8dc7595 1c1e54c
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Sep 28 00:33:56 2012 -0700

    am 1c1e54c3: am fb853a6c: JZO54I factory image for yakju

    * commit '1c1e54c3f4aabec1d111eba44d87e1bd06f4940b':
      JZO54I factory image for yakju

commit 1c1e54c3f4aabec1d111eba44d87e1bd06f4940b
Merge: bfe7277 fb853a6
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Sep 27 12:49:36 2012 -0700

    am fb853a6c: JZO54I factory image for yakju

    * commit 'fb853a6cc780dd09752029c530207b83f7e781b6':
      JZO54I factory image for yakju

commit fb853a6cc780dd09752029c530207b83f7e781b6
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Sep 27 12:39:43 2012 -0700

    JZO54I factory image for yakju

    Change-Id: I21b53cf6e4b0e696209a8f9d6bca434c1b191652

commit 8dc75951c7b02eb4073f20fd7d388154d557c317
Merge: a83a6d0 bfe7277
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Sep 26 13:29:52 2012 -0700

    am bfe7277c: am e62b9f87: JZO54I factory images for yakju

    * commit 'bfe7277c6f70ac700f1858ae1d75058ca42f31d0':
      JZO54I factory images for yakju

commit bfe7277c6f70ac700f1858ae1d75058ca42f31d0
Merge: 554f66f e62b9f8
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Sep 26 13:28:06 2012 -0700

    am e62b9f87: JZO54I factory images for yakju

    * commit 'e62b9f871d31f92c3b7109913d316d63c26d4745':
      JZO54I factory images for yakju

commit e62b9f871d31f92c3b7109913d316d63c26d4745
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Sep 26 13:03:24 2012 -0700

    JZO54I factory images for yakju

    Change-Id: I7e9e302e4b620ce94dbcbbaade76c4e842f66b85

commit a83a6d0595c3aa70a207355a1d224fd4f703401b
Merge: 02b6de2 554f66f
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Sep 24 00:50:17 2012 -0700

    am 554f66f1: am a56b9f48: resolved conflicts for merge of 7464c1fa to jb-dev-plus-aosp

    * commit '554f66f1e840bd2accd0d35f1f73f302c637162e':
      Self-extractors for JRO03R binaries for maguro

commit 8bb850ab4c6d7c57a0a9e77d33e00f43a8876b76
Merge: 4698eeb 554f66f
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Sep 21 17:48:54 2012 -0700

    am 554f66f1: am a56b9f48: resolved conflicts for merge of 7464c1fa to jb-dev-plus-aosp

    * commit '554f66f1e840bd2accd0d35f1f73f302c637162e':
      Self-extractors for JRO03R binaries for maguro

commit 4698eeb91c0b77479767ee4c53dab92f668f7494
Merge: 73be3ba 21eda0c
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Sep 21 13:35:08 2012 -0700

    am 21eda0c3: (-s ours) am e189fb46: (-s ours) Reconcile with stage-aosp-jb-release - do not merge

    * commit '21eda0c31a96068540649c310850958331c258b9':
      Remove version requirements for AOSP

commit 02b6de29f43a7abdbf87e72a26bf0b1e789a70e0
Merge: 73be3ba 21eda0c
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 20 20:31:27 2012 -0700

    am 21eda0c3: (-s ours) am e189fb46: (-s ours) Reconcile with stage-aosp-jb-release - do not merge

    * commit '21eda0c31a96068540649c310850958331c258b9':
      Remove version requirements for AOSP

Change-Id: I9ae44de8cc990d7a9fba13ea92a2d403827cc4e5