Squashed commit of the following:

commit 69346fe3aad6b6f75cb5b6dfe3c14fbc2dbb5d9d
Author: Steve Kondik <shade@chemlab.org>
Date:   Fri May 24 12:53:51 2013 -0700

    nfc_nci: Allow passing in the HAL suffix as a variable

    Change-Id: If79078ee2d02a5117e5d8aec98ae6153d8953f1a

commit 2ee35731273cfe77746efbe48c76bb96c51250df
Merge: bcfb685 a0d5895
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Wed Jul 24 21:57:16 2013 +0100

    Merge tag 'android-4.3_r2.1' into cm-10.2

    Android 4.3 release 2.1

commit bcfb685cc91ba5989f0d9bb7c48a619171679d15
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Wed Jul 24 21:57:04 2013 +0100

    Revert "nfc_nci: Allow passing in the HAL suffix as a variable"

    This reverts commit 0a5586e981b934719a09f8246f26fe1b8c1c3a6d.

commit 0a5586e981b934719a09f8246f26fe1b8c1c3a6d
Author: Steve Kondik <shade@chemlab.org>
Date:   Fri May 24 12:53:51 2013 -0700

    nfc_nci: Allow passing in the HAL suffix as a variable

    Change-Id: If79078ee2d02a5117e5d8aec98ae6153d8953f1a

commit e48d95e993be69df1b0911d686490be412f25cfd
Merge: a058fe3 e9df6ba
Author: Steve Kondik <shade@chemlab.org>
Date:   Thu Dec 27 12:22:47 2012 -0800

    Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/libnfc-nci into aosp

commit a058fe34fadff67c4cd6c276141639f696b5bfdb
Merge: 095819c a041bc7
Author: Martijn Coenen <maco@google.com>
Date:   Tue Oct 23 10:05:12 2012 -0700

    am a041bc7c: Prevent invalid HCI data being stored on fs.

    * commit 'a041bc7cb11d52e4d17b5898e234c20a42bc74ce':
      Prevent invalid HCI data being stored on fs.

commit a041bc7cb11d52e4d17b5898e234c20a42bc74ce
Author: Martijn Coenen <maco@google.com>
Date:   Mon Oct 22 17:55:06 2012 -0700

    Prevent invalid HCI data being stored on fs.

    Make sure we don't store HCI network data
    in case "type A card emulation" is not valid.

    Bug: 7387638
    Change-Id: I56b135ffd5c7372cb8401262994bd1930cc9d4a9

commit 095819c98eb55a33975e3ef5bdac188fee22563c
Merge: c0d257b a4b403f
Author: Martijn Coenen <maco@google.com>
Date:   Thu Oct 18 13:44:41 2012 -0700

    am a4b403f6: Merge "Fix config responses not being acked up to the JNI." into jb-broadcom-nfc

    * commit 'a4b403f68eedfb6c690443bd7dcd3e38186f3b6d':
      Fix config responses not being acked up to the JNI.

commit a4b403f68eedfb6c690443bd7dcd3e38186f3b6d
Merge: ee00835 e7dce7c
Author: Martijn Coenen <maco@google.com>
Date:   Thu Oct 18 13:43:33 2012 -0700

    Merge "Fix config responses not being acked up to the JNI." into jb-broadcom-nfc

commit c0d257b5de50a8b55595a73f5e64573f7d068c88
Merge: df2580e ee00835
Author: Evan Chu <evanchu@broadcom.com>
Date:   Wed Oct 17 20:52:40 2012 -0700

    am ee00835d: Stack shall clear the content of persistent storage

    * commit 'ee00835dfad4b11b2df72ae7caeea1c6ceba2e6c':
      Stack shall clear the content of persistent storage

commit e7dce7c60a33ea3f728c37d35688358743ee0dcd
Author: Martijn Coenen <maco@google.com>
Date:   Wed Oct 17 16:10:45 2012 -0700

    Fix config responses not being acked up to the JNI.

    If a config command is sent to the core stack and
    we're powering down right after it, the bits that
    keep track of outstanding config bits do not
    get reset properly (even if we still get a response).

    Clear the bits whenever we come back to full
    power again.

    Bug: 7366863
    Change-Id: I405caa40c90a9c98276580d830c2c8809afc707b

commit ee00835dfad4b11b2df72ae7caeea1c6ceba2e6c
Author: Evan Chu <evanchu@broadcom.com>
Date:   Wed Oct 17 16:42:01 2012 -0400

    Stack shall clear the content of persistent storage

    Reset non-volatile data on clear-all-pipe notification.
    This operation clears the content of persistent storage related to
    secure element.

    Bug: 7350357
    Change-Id: I570f03c3fb0266bd217d3883b159990f29e2d3c7

commit df2580ee369b28007dc717d51cd4302b4b51302b
Merge: 0e44001 c47b316
Author: Evan Chu <evanchu@broadcom.com>
Date:   Tue Oct 16 10:52:38 2012 -0700

    am c47b3168: Don\'t print error message regarding NCI_VERSION.

    * commit 'c47b3168f900ef2470be7761a74039152132e623':
      Don't print error message regarding NCI_VERSION.

commit c47b3168f900ef2470be7761a74039152132e623
Author: Evan Chu <evanchu@broadcom.com>
Date:   Mon Oct 15 16:40:38 2012 -0400

    Don't print error message regarding NCI_VERSION.

    Adjust diagnostic message in Userial.

    Bug: 7357666
    Change-Id: I9e9246b30d3aa787f7ddee1e24216242ecac5314

commit 0e440012ee4e95e1bb3c4e9c2b8ee6f1fa5c0d7f
Merge: df24e0b 673a037
Author: Martijn Coenen <maco@google.com>
Date:   Mon Oct 15 20:18:09 2012 -0700

    am 673a037e: Don\'t hang when disabling NFC in low-power sleep.

    * commit '673a037ee1092cf532d15ef1c129fef3808e7faf':
      Don't hang when disabling NFC in low-power sleep.

commit 673a037ee1092cf532d15ef1c129fef3808e7faf
Author: Martijn Coenen <maco@google.com>
Date:   Sun Oct 14 16:38:50 2012 -0700

    Don't hang when disabling NFC in low-power sleep.

    Bug: 7348651
    Change-Id: I8629d24f76490278ee2c6687e751c05c78f2909c

commit df24e0bf9b4dce5986802295569ae56bd6b24dbe
Merge: a90c182 2f38594
Author: Martijn Coenen <maco@google.com>
Date:   Mon Oct 15 12:57:27 2012 -0700

    am 2f38594a: Restart NFC when there is a controller timeout.

    * commit '2f38594a415a2160e8ea314dd4dcdcd39d878e64':
      Restart NFC when there is a controller timeout.

commit 2f38594a415a2160e8ea314dd4dcdcd39d878e64
Author: Martijn Coenen <maco@google.com>
Date:   Sun Oct 14 16:38:50 2012 -0700

    Restart NFC when there is a controller timeout.

    Bug: 7345591
    Change-Id: I5c196756e30b2b409f9d75fc34094f1454dd7fb9

commit a90c182c310eeb06fdbabd4b2b665e8e7b7edcbf
Merge: 514d795 73ee6bd
Author: Martijn Coenen <maco@google.com>
Date:   Tue Oct 9 09:57:03 2012 -0700

    am 73ee6bd9: Merge "Force NFC-DEP (p2p) protocol to the DH." into jb-broadcom-nfc

    * commit '73ee6bd9a430b2247c714f30f86b56f2af648e96':
      Force NFC-DEP (p2p) protocol to the DH.

commit 73ee6bd9a430b2247c714f30f86b56f2af648e96
Merge: abaaafe 1ba71eb
Author: Martijn Coenen <maco@google.com>
Date:   Tue Oct 9 09:55:33 2012 -0700

    Merge "Force NFC-DEP (p2p) protocol to the DH." into jb-broadcom-nfc

commit 1ba71eb91862d97e01655a634b736934deea3db4
Author: Evan Chu <evanchu@broadcom.com>
Date:   Mon Oct 8 11:44:32 2012 -0400

    Force NFC-DEP (p2p) protocol to the DH.

    We don't support NFC-DEP by the eSE. To
    enable reporting of a SAK indicating
    p2p support (0x40) on Nfc-A, always
    route NFC-DEP to the DH.

    Bug: 7301990
    Change-Id: I4a4f64753148d80ad23123276f913ba342cad237

commit 514d795a49267fbc9fcb0c2dd0df230702f149c6
Merge: abd6efd abaaafe
Author: Martijn Coenen <maco@google.com>
Date:   Sun Oct 7 13:08:20 2012 -0700

    am abaaafe1: Insert a minimum delay of 5ms between back-to-back writes.

    * commit 'abaaafe1ab72ca7c74a904bfb26ec7eaeea02713':
      Insert a minimum delay of 5ms between back-to-back writes.

commit abaaafe1ab72ca7c74a904bfb26ec7eaeea02713
Author: Martijn Coenen <maco@google.com>
Date:   Sun Oct 7 12:40:18 2012 -0700

    Insert a minimum delay of 5ms between back-to-back writes.

    On Manta the NFC controller is connected to the SPI interface.
    NCI forum has defined a custom flow-control mechanism over SPI,
    that requires the host to wait for an out-of-band SPI_INT line
    to go low before transmitting data. The SPI-controller on our SoC
    however can't wait for an out-of-band signal - it immediately
    pulls down SPI_CS and starts writing.

    For cmd followed by cmd, and data followed by data, this is not
    a problem, because we wait for a response / credits respectively.
    However, for cmd followed by data, or vice-versa, we have no
    flow control mechanism. At this point the simple and safe fix is just
    to delay 5ms between any two writes. This should not hurt performance
    as we're already waiting 5ms between large packets (where performance
    counts most).

    Bug: 7283947
    Change-Id: I56567d816cc6be06fc3f7fa2f06699a32285f190

commit abd6efd0b363cbbc551ab7317bb4c623c9713dd3
Merge: ac814ad 30423b8
Author: Evan Chu <evanchu@broadcom.com>
Date:   Fri Oct 5 10:48:49 2012 -0700

    am 30423b8f: Fix T3T reading and RF credits on Manta.

    * commit '30423b8fe42b7efeaf0e0eae2c0f4f758e98c0ab':
      Fix T3T reading and RF credits on Manta.

commit 30423b8fe42b7efeaf0e0eae2c0f4f758e98c0ab
Author: Evan Chu <evanchu@broadcom.com>
Date:   Thu Oct 4 11:37:13 2012 -0400

    Fix T3T reading and RF credits on Manta.

    Changes include:
    * Remove Broadcom-specific destination host, gate values.
    * Properly read NDEF message on Type-3 tag.
    * Adjust GID of activation notification (credits for Manta).

    Author: Paul Chaisson

    Bug: 7282057
    Change-Id: I4859d61028bedcc19045b5f376e1822f38409e5d

commit ac814ada706d1f33de2c56e75ba01d1e92688d14
Merge: e40b698 38666aa
Author: Evan Chu <evanchu@broadcom.com>
Date:   Wed Oct 3 20:09:33 2012 -0700

    am 38666aab: Stack fix for NFA_RwT3tWrite crash.

    * commit '38666aab1397040df51ab6d28520b3930df1df3f':
      Stack fix for NFA_RwT3tWrite crash.

commit e40b698e2a0e4298c808881934bb02cfa82ccb7b
Merge: 9cbd934 5bf83a7
Author: Evan Chu <evanchu@broadcom.com>
Date:   Wed Oct 3 20:08:26 2012 -0700

    am 5bf83a74: Handle deleted connectivity pipe.

    * commit '5bf83a74c2a6088dbf15980ad4fed2be4f254486':
      Handle deleted connectivity pipe.

commit 9cbd9343e5bf3a1c7a0ad4f999447a1b5a073c54
Merge: fc7b623 794a322
Author: Evan Chu <evanchu@broadcom.com>
Date:   Wed Oct 3 20:08:25 2012 -0700

    am 794a3220: When EEPROM is not detected, re-initialize controller

    * commit '794a3220e013b6c679f2127792859e6b751ee280':
      When EEPROM is not detected, re-initialize controller

commit 38666aab1397040df51ab6d28520b3930df1df3f
Author: Evan Chu <evanchu@broadcom.com>
Date:   Wed Oct 3 13:04:59 2012 -0400

    Stack fix for NFA_RwT3tWrite crash.

    Bug: 7282057
    Change-Id: I792acf5a5ce40a4bcea455b2e9d776781bd7d59a

commit 5bf83a74c2a6088dbf15980ad4fed2be4f254486
Author: Evan Chu <evanchu@broadcom.com>
Date:   Tue Oct 2 23:08:36 2012 -0400

    Handle deleted connectivity pipe.

    We've found that when some UICC/SE's are busy
    with reconfiguration, they will no longer accepted
    APDUs from the host and time out on those.

    To avoid this, queue any APDUs from the host
    until the reconfiguration of the SE is done.

    Bug: 7257431
    Change-Id: I4e50c043a968f91dd3972ed3a58938a047e551cd

commit 794a3220e013b6c679f2127792859e6b751ee280
Author: Evan Chu <evanchu@broadcom.com>
Date:   Fri Sep 28 12:38:03 2012 -0400

    When EEPROM is not detected, re-initialize controller

    HAL will re-initialize the controller, which
    should eventually detect EEPROM.

    Bug: 7249838
    Change-Id: I00c81790d959dd1d6d84cf5d4aacb505ec771050

commit fc7b623107b7cf3320c3930ce34dd28ef0bbef95
Merge: 3cb4865 1cee7ea
Author: Evan Chu <evanchu@broadcom.com>
Date:   Wed Oct 3 13:39:43 2012 -0700

    am 1cee7ea1: Improve robustness of firmware download procedure.

    * commit '1cee7ea1898ae8dbcff534f684c5cbcdd6dc6a85':
      Improve robustness of firmware download procedure.

commit 1cee7ea1898ae8dbcff534f684c5cbcdd6dc6a85
Author: Evan Chu <evanchu@broadcom.com>
Date:   Fri Sep 28 15:20:52 2012 -0400

    Improve robustness of firmware download procedure.

    Allow NFCC to come up with current firmware in NVM whenever:
    - The patchfiles are not present
    - The patchfiles are corrupt
    - There is a problem with downloading the patch

    Bug: 7090159
    Change-Id: I65116e519918ed16e22173510adf9d5e5de44410

commit 3cb48657257c70113a45d420a218ecf5657daeb7
Merge: f62dacc c7e1256
Author: Paul Chaisson <pchaisson@broadcom.com>
Date:   Tue Oct 2 12:55:53 2012 -0700

    am c7e1256e: Configuration option to substitute AID in empty select.

    * commit 'c7e1256eb29c65ff9bff5fddca6aa250eec91cea':
      Configuration option to substitute AID in empty select.

commit c7e1256eb29c65ff9bff5fddca6aa250eec91cea
Author: Paul Chaisson <pchaisson@broadcom.com>
Date:   Sun Sep 30 21:48:44 2012 -0400

    Configuration option to substitute AID in empty select.

    Bug: 7198430
    Change-Id: I7a3684a838716d6871d2e49ac9eac5e9cd3fca1a

commit f62dacc1c951902316b432c520177d95daa4421c
Merge: e0059a7 4c1bc8e
Author: Paul Chaisson <pchaisson@broadcom.com>
Date:   Mon Oct 1 23:31:41 2012 -0700

    am 4c1bc8e7: Add support for setting MAX_RF_DATA_CREDITS from config.

    * commit '4c1bc8e7ac6e7bfba5d1d9a5782235f3c94d7294':
      Add support for setting MAX_RF_DATA_CREDITS from config.

commit e0059a71114d64108ec75a5caa2f38fc3991d4a2
Merge: 834826e 34785a5
Author: Evan Chu <evanchu@broadcom.com>
Date:   Mon Oct 1 23:31:40 2012 -0700

    am 34785a5d: Don\'t hang when warm-reset of SE times out.

    * commit '34785a5d8cf38d96df9535f4673d03b31fc16d9e':
      Don't hang when warm-reset of SE times out.

commit 4c1bc8e7ac6e7bfba5d1d9a5782235f3c94d7294
Author: Paul Chaisson <pchaisson@broadcom.com>
Date:   Sun Sep 30 23:18:38 2012 -0400

    Add support for setting MAX_RF_DATA_CREDITS from config.

    Bug: 7164846
    Change-Id: I9b516113ddee8dabadcf6cb6e8f6bec820f4b141

commit 34785a5d8cf38d96df9535f4673d03b31fc16d9e
Author: Evan Chu <evanchu@broadcom.com>
Date:   Fri Sep 28 13:32:13 2012 -0400

    Don't hang when warm-reset of SE times out.

    Bug: 7242068
    Change-Id: I9ca43bff25285b219bb596408fbb783b0b1c1fea

commit 834826e7896466d6d1ed77b2322b79dbcd4f6e57
Merge: 18e31c9 ba4c17e
Author: Evan Chu <evanchu@broadcom.com>
Date:   Mon Oct 1 14:04:50 2012 -0700

    am ba4c17ee: Upgrade to stack 1.3.45

    * commit 'ba4c17ee1d31e1b9f396292711f1414d449dd361':
      Upgrade to stack 1.3.45

commit ba4c17ee1d31e1b9f396292711f1414d449dd361
Author: Evan Chu <evanchu@broadcom.com>
Date:   Fri Sep 28 12:55:04 2012 -0400

    Upgrade to stack 1.3.45

    - Add halimpl/bcm2079x/libnfc-brcm.conf to keep track of its content.
    - Add src/libnfc.conf to keep track of its content.
    - Properly shutdown stack [in case NFC controller doesn't come up].
    - Do not calculate firmware size [needed for FW > 98].
    - HAL cleanup.

    Bug: 7202185
    Bug: 7214014
    Change-Id: I11c646819e28e377c5db9d627d79050a05d9ff69

commit 18e31c966d6014e5290fbcdd9463f672faf7361e
Merge: 9d3823d 17eea69
Author: Martijn Coenen <maco@google.com>
Date:   Sun Sep 30 16:22:18 2012 -0700

    am 17eea69d: Retry NFC controller reset.

    * commit '17eea69d283e0e878f6539f598e683b83ad57112':
      Retry NFC controller reset.

commit 17eea69d283e0e878f6539f598e683b83ad57112
Author: Martijn Coenen <maco@google.com>
Date:   Sun Sep 30 15:10:25 2012 -0700

    Retry NFC controller reset.

    We've seen the BCM2079x controller not coming up on Mako
    devices in extended tests. In case we can't fix the root
    cause in hw, this change will retry the reset for a maximum
    of 4 times. We know the reset doesn't work when the change
    address ioctl doesn't complete successfully, as that executes
    an I2C write that fails if the controller did not come up.

    This is not a solution for Manta where we don't need the change
    address - we'll come up with a solution later that involves sending
    some sort of init command to make sure the controller came up.

    Bug: 7258919
    Change-Id: I01848c77c283a1d60c89342d44931a5f1c2a10b4

commit 9d3823d843b745ac0764e3c37f945585fbcd44ca
Merge: fb7f568 fd02a51
Author: Martijn Coenen <maco@google.com>
Date:   Sun Sep 30 09:34:38 2012 -0700

    am fd02a511: Merge "Increase NCI command/response timeout to 2 seconds." into jb-broadcom-nfc

    * commit 'fd02a5118603dd8f6b46842ab997c5b674e3ff15':
      Increase NCI command/response timeout to 2 seconds.

commit fd02a5118603dd8f6b46842ab997c5b674e3ff15
Merge: ea33aa0 49f1aee
Author: Martijn Coenen <maco@google.com>
Date:   Sun Sep 30 09:33:38 2012 -0700

    Merge "Increase NCI command/response timeout to 2 seconds." into jb-broadcom-nfc

commit 49f1aee5a16107e3038a9bb5f52743b684477432
Author: Martijn Coenen <maco@google.com>
Date:   Sat Sep 29 12:55:04 2012 -0700

    Increase NCI command/response timeout to 2 seconds.

    We've seen that some NCI commands sent during firmware
    download can take longer than 1 second. Increase the timeout
    to 2 seconds to make sure firmware download can complete.

    Bug: 7257302
    Change-Id: I41923e0a20512e4c4633c4054a14ae273da187b1

commit fb7f5684a7773e99968659ea0d40fb8f7cf55d39
Merge: 9104868 ea33aa0
Author: Evan Chu <evanchu@broadcom.com>
Date:   Wed Sep 26 12:50:32 2012 -0700

    am ea33aa08: During transport error, unblock sync events.

    * commit 'ea33aa0892282417adb9359c660795acf6fe7ac1':
      During transport error, unblock sync events.

commit ea33aa0892282417adb9359c660795acf6fe7ac1
Author: Evan Chu <evanchu@broadcom.com>
Date:   Mon Sep 24 23:59:49 2012 -0400

    During transport error, unblock sync events.

    When error event occurs, unblock all SyncEvent objects.
    HAL_NFC_ERROR_EVT occurs when there is transport error.

    Bug: 7214014
    Change-Id: Ib92c9d03c166b3a33f69ea61bc83047079df770e

commit 9104868477c8c2cb546d4347fb104025aa28bd3b
Merge: adf746d 6a36486
Author: Evan Chu <evanchu@broadcom.com>
Date:   Fri Sep 21 15:49:15 2012 -0700

    am 6a36486b: Print error message in case of GKI error.

    * commit '6a36486bba856b2ea2783c88f47e262c131a68fb':
      Print error message in case of GKI error.

commit 6a36486bba856b2ea2783c88f47e262c131a68fb
Author: Evan Chu <evanchu@broadcom.com>
Date:   Fri Sep 21 10:28:23 2012 -0400

    Print error message in case of GKI error.

    When GKI fails to allocate buffer, print error message.
    Remove some line-feed and carriage-return characters in log messages.

    Bug: 7113095
    Change-Id: Iefbf35f4cc450d731ef24e48c6471c04b920ea70

commit adf746d52123c5ed652e1c4d724ae12180f9f80f
Merge: 3fce624 42d73cd
Author: Martijn Coenen <maco@google.com>
Date:   Thu Sep 20 20:41:40 2012 -0700

    am 42d73cd9: Tweak logging for enabling error traces.

    * commit '42d73cd99ecb8ad8d1108017be383d871b288605':
      Tweak logging for enabling error traces.

commit 42d73cd99ecb8ad8d1108017be383d871b288605
Author: Martijn Coenen <maco@google.com>
Date:   Thu Sep 20 19:35:38 2012 -0700

    Tweak logging for enabling error traces.

    - Always log firmware version in NVM once
    - Always log GKI buffer allocation failures
    - Change some errors to warnings as they're not critical

    Bug: 7113095
    Change-Id: I54ad4193c67648e074fec287c1901d0f06fedecd

commit 3fce624236703d7579ff4591cf23b7687df7e227
Merge: e3f7e1b 19d9a74
Author: Martijn Coenen <maco@google.com>
Date:   Thu Sep 20 13:30:06 2012 -0700

    am 19d9a743: Merge "Grant license" into jb-broadcom-nfc

    * commit '19d9a743b219b7072f15aa318a2ca15b7eb3e445':
      Grant license

commit e3f7e1bf5aea8d26fd71536f9b2284338e234f02
Merge: e2c4f38 43ddc23
Author: Martijn Coenen <maco@google.com>
Date:   Thu Sep 20 13:30:05 2012 -0700

    am 43ddc232: Increase delay when downloading NFC firmware.

    * commit '43ddc2324836d0204f82bb8505b9c5ab143b0c08':
      Increase delay when downloading NFC firmware.

commit 19d9a743b219b7072f15aa318a2ca15b7eb3e445
Merge: 43ddc23 8a32b54
Author: Martijn Coenen <maco@google.com>
Date:   Thu Sep 20 13:28:42 2012 -0700

    Merge "Grant license" into jb-broadcom-nfc

commit e2c4f380c51c72367fad2cf41a03d5bca793cd5b
Merge: 1eeddcc b58ba0e
Author: Evan Chu <evanchu@broadcom.com>
Date:   Thu Sep 20 12:48:50 2012 -0700

    am b58ba0e8: copyright by Broadcom, use Apache License

    * commit 'b58ba0e89a3767e6174c42d3e90540d1eae10f81':
      copyright by Broadcom, use Apache License

commit 8a32b5467bbc8ac9e65c8c7084612591da33c2cf
Author: Evan Chu <evanchu@broadcom.com>
Date:   Thu Sep 20 14:40:04 2012 -0400

    Grant license

    Bug: 7125646
    Change-Id: I93a5e05f6bc10ce7a845ceff4d2ff5a4e396f307

commit 43ddc2324836d0204f82bb8505b9c5ab143b0c08
Author: Martijn Coenen <maco@google.com>
Date:   Thu Sep 20 10:39:31 2012 -0700

    Increase delay when downloading NFC firmware.

    Regression from the HAL.

    Bug: 7202185
    Change-Id: Ia087ce779f297cc964e72949e3d59fd1a04bd8ec

commit b58ba0e89a3767e6174c42d3e90540d1eae10f81
Author: Evan Chu <evanchu@broadcom.com>
Date:   Wed Sep 19 18:22:02 2012 -0400

    copyright by Broadcom, use Apache License

    Bug: 7125646
    Change-Id: Iff12339ef9e7de277d5bf024f6549c8c1792c03f

commit 1eeddcc64e67ba488951132e66a187e06dba19fe
Merge: 8ad2776 8028cde
Author: Martijn Coenen <maco@google.com>
Date:   Wed Sep 19 13:17:08 2012 -0700

    am 8028cdec: Call GKI_freebug after POST_CORE_RESET.

    * commit '8028cdec6af5f22df29a5f5e2bbb88db2cb63cf8':
      Call GKI_freebug after POST_CORE_RESET.

commit 8028cdec6af5f22df29a5f5e2bbb88db2cb63cf8
Author: Martijn Coenen <maco@google.com>
Date:   Wed Sep 19 12:00:51 2012 -0700

    Call GKI_freebug after POST_CORE_RESET.

    Bug: 7195192
    Change-Id: Icfe5cdb2e37682272692e8b01384675acaf2933e

commit 8ad27769977e5f99266449fd42de0566d861f3fe
Merge: 2e8f66e eb19065
Author: Evan Chu <evanchu@broadcom.com>
Date:   Tue Sep 18 17:07:14 2012 -0700

    am eb190654: Integrate with NFC Hardware Abstraction Layer

    * commit 'eb190654c5fbaea2f396bb5523f57062f291879a':
      Integrate with NFC Hardware Abstraction Layer

commit eb190654c5fbaea2f396bb5523f57062f291879a
Author: Evan Chu <evanchu@broadcom.com>
Date:   Thu Sep 13 17:34:35 2012 -0400

    Integrate with NFC Hardware Abstraction Layer

    Also upgraded to stack 1.3.43 for HAL features

    Bug: 7123942
    Change-Id: I24c66c49cc4e54e0ef9d7861d33adf670fb87d0b

commit 2e8f66ebe73944bd928d1b04794de9e848ec558e
Merge: d4eed92 635ce0b
Author: Paul Chaisson <pchaisson@broadcom.com>
Date:   Fri Sep 7 03:57:17 2012 -0700

    am 635ce0b0: Added conf file value name for polling duration (NFA_DM_DISC_DURATION_POLL).

    * commit '635ce0b008e3c63e6eaa7992af2484118e17fefe':
      Added conf file value name for polling duration (NFA_DM_DISC_DURATION_POLL).

commit 635ce0b008e3c63e6eaa7992af2484118e17fefe
Author: Paul Chaisson <pchaisson@broadcom.com>
Date:   Thu Sep 6 23:50:17 2012 -0400

    Added conf file value name for polling duration (NFA_DM_DISC_DURATION_POLL).

    Change-Id: I66bc580e6f8c69344e8504500cb7e07aa6080845

commit d4eed921e384d92ca7e96be298cc309215faac87
Merge: 51c510c 76ac457
Author: Evan Chu <evanchu@broadcom.com>
Date:   Thu Sep 6 09:12:22 2012 -0700

    am 76ac4570: Use enough delay during firmware patch download

    * commit '76ac4570876bd364410d4d0253c0d6647fc3bca4':
      Use enough delay during firmware patch download

commit 51c510cdcb09aca17d55f426aa1b46200cbe4e83
Merge: a9c5521 01d28b8
Author: Evan Chu <evanchu@broadcom.com>
Date:   Thu Sep 6 09:12:22 2012 -0700

    am 01d28b8f: flush tx data queue after timed out

    * commit '01d28b8f024088e8b16e16fc5c80a2fef5c24144':
      flush tx data queue after timed out

commit a9c5521977680885d52510c44ce07fbc5ff84291
Merge: afed28b 2394448
Author: Evan Chu <evanchu@broadcom.com>
Date:   Thu Sep 6 09:12:21 2012 -0700

    am 23944481: Remove "brcm" in names

    * commit '23944481f6ec86760286c0e1805750d94d8137aa':
      Remove "brcm" in names

commit afed28bb6f3d0888ad5d268a25df017933ea2a14
Author: Evan Chu <evanchu@broadcom.com>
Date:   Wed Sep 5 11:19:50 2012 -0400

    Remove "brcm" in names

    BLTH01642677.  Remove "brcm" in names

    Change-Id: If6f1b13b9d3056248d1e7bfd77b5e81456b8236f

commit 76ac4570876bd364410d4d0253c0d6647fc3bca4
Author: Evan Chu <evanchu@broadcom.com>
Date:   Wed Sep 5 12:33:09 2012 -0400

    Use enough delay during firmware patch download

    Bug: 7088544
    Change-Id: Ia995454e723b93c489f103029c56aa36af862ac7

commit 01d28b8f024088e8b16e16fc5c80a2fef5c24144
Author: Evan Chu <evanchu@broadcom.com>
Date:   Wed Sep 5 11:26:39 2012 -0400

    flush tx data queue after timed out

    BLTH01652784: Need to flush tx data queue when LLCP decides LLCP link has timed out.
    This stack fix is based on 1.3.36.  See main_sherrys_1650236.

    Change-Id: Ia421329e047a1fdca390c3183b707fbc88635afd

commit 23944481f6ec86760286c0e1805750d94d8137aa
Author: Evan Chu <evanchu@broadcom.com>
Date:   Wed Sep 5 11:19:50 2012 -0400

    Remove "brcm" in names

    BLTH01642677.  Remove "brcm" in names

    Change-Id: If6f1b13b9d3056248d1e7bfd77b5e81456b8236f

commit ad483f6fa0128f07fd2187bb9c46c2e3f7728cc5
Author: Evan Chu <evanchu@broadcom.com>
Date:   Thu Aug 30 13:59:37 2012 -0400

    Upgrade to stack NFA_MI_1.03.36

    Upgrade to stack NFA_MI_1.03.36; add stack CR 1647545.

    Change-Id: I172170a22263a5c7af19ee616cdd9933592d0a85

commit 3d1ef9844e99f6184f5c9c15d470877c5aa00103
Author: Paul Chaisson <pchaisson@broadcom.com>
Date:   Tue Aug 21 13:18:27 2012 -0400

    Update patch download procedure to support patch 76 and later.

    Change-Id: I046f33e21327269cbec293ef85371eb62f7c5166

commit 106eae004dff2ddeb4f715424178a876bab19717
Author: Martijn Coenen <maco@google.com>
Date:   Fri Aug 17 16:28:49 2012 -0700

    Change HCI response timeout to 10 seconds.

    We've seen the SE requires more than 1 second
    to complete certain operations. Change to a safe
    upper-bound that matches the NFC service timeout.

    Change-Id: Ia5f5c809866292b5865eb4ebc699d1098b532580

commit 4356939d2a022dc570d21ebe6f7cefff6b85edda
Author: Martijn Coenen <maco@google.com>
Date:   Fri Aug 10 17:34:40 2012 -0700

    Change default poll frequency in NCI stack.

    From 1000ms to 500ms. Decreases tag discovery latency.

    Change-Id: Ie06700592597a0c4d178e5d3db1f2dbea1d3daf4

commit e29968cf3e053557a9c2efc5a7a42d0767c51d9d
Author: Evan Chu <evanchu@broadcom.com>
Date:   Fri Aug 10 17:58:08 2012 -0400

    New NFC stack drop from partner (8/10).

    * The new stack is NFCA_PI_403.10.0.74,
    which contains NFA_MI_1.03.33 plus fixes.

    * Take stack CR that logs vendor-commands as NCI protocol trace.

    * Fix interface-error after rf-discovery-select.

    * Stack version information is in src/stack-info.txt.

    * Use android property, nfc.app_log_level, to override log setting in .conf.

    Change-Id: I1a16b31f2ba6c44d23ba54c886bff050a8323d0e

commit d30d9deb6eadc55fd61644189417810d96575227
Author: Stephen Hines <srhines@google.com>
Date:   Wed Aug 8 19:18:09 2012 -0700

    Add a CleanSpec due to astl dependency removal.

    Change-Id: I459a8aeb81ee98c48055d9bce53f728c98448961

commit e04a20e2f0a6b679bb5e71ab961872faf5443800
Author: Elliott Hughes <enh@google.com>
Date:   Tue Aug 7 14:26:45 2012 -0700

    Switch from the dead astl to stlport for libnfc-nci.

    Change-Id: I426726b970af8bf052d187136f06e7d217b3666a

commit 8693f9f4bb730948c02a83e4a6eed34cdbccda69
Merge: e48337d 993437a
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:05:12 2012 -0700

    am 993437a4: Follow-up NFC code drop.

    * commit '993437a401849447dfaabc2edf53e682e056a5a4':
      Follow-up NFC code drop.

commit e48337d82549b74b597e0b53a75697935083defc
Merge: a2629b2 f8a4ca3
Author: Evan Chu <evanchu@broadcom.com>
Date:   Tue Aug 7 09:05:11 2012 -0700

    am f8a4ca32: (-s ours) Initial Broadcom NFC stack commit.

    * commit 'f8a4ca325ef137a94869b34d36095ba7d08816a3':
      Initial Broadcom NFC stack commit.

commit a2629b297f3b9f8eee7ce9dd5f890d5eb6cf9321
Merge: 63f80ce 0302349
Author: Chad Jones <chadj@google.com>
Date:   Tue Aug 7 02:28:17 2012 -0700

    am 03023496: Test replication with empty commit

    * commit '030234960de9492481b0ec3a3b6584f1835c99b6':
      Test replication with empty commit

commit 993437a401849447dfaabc2edf53e682e056a5a4
Author: Martijn Coenen <maco@google.com>
Date:   Mon Jul 30 14:30:39 2012 -0700

    Follow-up NFC code drop.

    From partner, uploaded 07/26/2012; only change made
    is stripping ^M.

    Change-Id: I172ed4480d0e3eaa064ea46c0034b153b334801c

commit f8a4ca325ef137a94869b34d36095ba7d08816a3
Author: Evan Chu <evanchu@broadcom.com>
Date:   Fri Jul 20 15:10:48 2012 -0400

    Initial Broadcom NFC stack commit.

    From partner push dated 07/20; only change made is stripping ^M.

    Change-Id: I29840a411f4004c31b063b0ad61e5490f9a8d5d7

commit 63f80ce896f0f8c203191b4e44e038fecb6be02a
Author: Martijn Coenen <maco@google.com>
Date:   Mon Jul 30 14:30:39 2012 -0700

    Follow-up NFC code drop.

    From partner, uploaded 07/26/2012; only change made
    is stripping ^M.

    Change-Id: I172ed4480d0e3eaa064ea46c0034b153b334801c

commit 45faad0ff5deeb0c676356345d99398cc4ab695a
Author: Evan Chu <evanchu@broadcom.com>
Date:   Fri Jul 20 15:10:48 2012 -0400

    Initial Broadcom NFC stack commit.

    From partner push dated 07/20; only change made is stripping ^M.

    Change-Id: I29840a411f4004c31b063b0ad61e5490f9a8d5d7

commit 030234960de9492481b0ec3a3b6584f1835c99b6
Author: Chad Jones <chadj@google.com>
Date:   Tue Jun 19 14:52:10 2012 -0700

    Test replication with empty commit

commit c2da87779993c82bc42d32183117c5b61cc8255c
Author: Chad Jones <chadj@google.com>
Date:   Tue Jun 19 14:25:15 2012 -0700

    Initial empty repository

Change-Id: I23d031109e676e8bcb281d02c8f41268310ca922