Fix issue 57873 Missing translation of the label "Touch to beam"

Root cause:
The SendUi View created when the system first bootup, if we changed
the language settings,the view did not re-create. And the text remained
orignal langguage.
E.G. we set the language to zh-CN, then reboot the phone, active the
SendUi, We see the label show as zh-CN. Then we change the language to
en-US, active the Send View, we find it still show as zh-CN.
Solution:
Set the lable text just before the view displayed.

Change-Id: I004ede4d0109a82f03a6d805062fb35b474e2d3b
Fix issue 57972 -- Nfc service thread deadlock...

If we set the timeout value with an invalidate value (zero or negtive
number),the Nfc service will deadlock, cannot discovery any tag, even
can not disable the Nfc service.

Root cause:
In function com_android_nfc_NfcManager_doSetTimeout, it return the
result before release the thread lock while timeout value is invalidate.

Change-Id: I43ba9c584b25023018107a1cfb6549b1452a9a0d
4.3 bringup merge from CM

--
Squashed commit of the following:

commit 2179fd368b019e2f0f419fd0eada5e2b693c18bb
Merge: 43c1153 36cf13f
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Thu Jul 25 00:31:49 2013 +0100

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

    Android 4.3 release 2.1

    Conflicts:
    	nxp/jni/com_android_nfc_NativeNfcManager.cpp
    	nxp/jni/com_android_nfc_NativeNfcTag.cpp
    	res/values-nl/strings.xml

    Change-Id: I2e53f288cd65fc179d5c385971e703f6eda0c232

commit 43c1153e4b31194a32b9be7febd5aa4a542cef3c
Author: doug yeager <doug@simplytapp.com>
Date:   Thu Feb 21 13:13:14 2013 -0600

    fixed inconsistant defines that are supposed to match tagtechnology.java

    Change-Id: If3afc9a3d46fe3780261d029caac18d242718e38

commit 90868bd91fd3829bb0006c377da12a651f95716b
Merge: f3b413c be1939b
Author: Steve Kondik <shade@chemlab.org>
Date:   Tue Feb 12 22:42:37 2013 -0800

    Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Nfc into 1.1

    Android 4.2.2 release 1

commit f3b413c98dd08327dafa564a10c17c84beac7b8f
Author: Steve Kondik <shade@chemlab.org>
Date:   Wed Feb 6 11:40:32 2013 -0800

    nfc: Add alternate firmware path

     * So we stay bug-for-bug compatible with OEMs.

    Change-Id: I0c14568d9f587ebcd2d21c0f0490b705be7ce8ce

commit fb908e2c4a086407fed5967aa3e1d7d53b348893
Merge: 6a645b3 525c260
Author: Steve Kondik <shade@chemlab.org>
Date:   Thu Dec 27 13:07:01 2012 -0800

    Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/Nfc into aosp

    Conflicts:
    	nci/src/com/android/nfc/dhimpl/NativeNfcManager.java
    	src/com/android/nfc/NfcService.java

    Change-Id: I52a73c696c003e8ccf513977968a42d917acf87a

commit 6a645b3241be2ba27b2b38f0cd68ad7e6fafafa5
Merge: 3d402b5 eba57c2
Author: Steve Kondik <shade@chemlab.org>
Date:   Sun Nov 18 22:49:42 2012 -0800

    Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/Nfc into HEAD

    Conflicts:
    	nxp/jni/com_android_nfc_NativeNfcManager.cpp

    Change-Id: Ic84af6ad1cda79984f40e9fc464d2cbaa994b89a

commit 3d402b5b2bd83007c5bffa4d40977e3314da4a91
Author: Kasper Hettinga <kasper.hettinga@gmail.com>
Date:   Tue Nov 6 19:36:07 2012 +0100

    Nfc: Dutch translations

    As discussed here: http://review.cyanogenmod.org/#/c/25947
    I changed Bluetooth to bluetooth

    Change-Id: If16d9aadba72a2af3387beaa731ffc4b92d1afa2

commit eba57c26732d3313befb574af85770452d841b87
Merge: 1a6bcf3 4e4a642
Author: The Android Automerger <android-build@android.com>
Date:   Mon Oct 29 11:20:20 2012 -0700

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

commit 1a6bcf3cca90fedfbad33c1cdd6d05af5774fc01
Author: Martijn Coenen <maco@google.com>
Date:   Thu Oct 25 20:49:48 2012 -0700

    Serialize applying card emulation route.

    Instead of immediately applying the routing,
    serialze the request with any outstanding
    commands (including NFC enable/disable). This
    prevents race conditions when NFC is being disabled
    and the card emu routing gets changed at the same time.

    Wait until the AsyncTask is complete, to make sure
    that the routing is applied (if possible) by the time
    the call returns.

    Bug: 7418238
    Change-Id: I7d92533179c02f4b6b01a86967737e64532317a1

commit 4e4a64299db48e56b7f8a4c7cbde9bc63280e897
Merge: 5cd1d0c 978d7e0
Author: The Android Automerger <android-build@android.com>
Date:   Thu Oct 25 13:42:40 2012 -0700

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

commit 5cd1d0c05c257bf8004594bdfd1e6b0e9c95428d
Author: Martijn Coenen <maco@google.com>
Date:   Wed Oct 24 12:35:08 2012 -0700

    Hold a wakelock during initialisation.

    The NCI stack may do firmware download as part
    of the intilization call. Make sure we don't
    suspend while the download is in progress.

    Also, hold a wakelock over the entire EEwipe
    procedure. This prevents suspending in the
    middle.

    Bug: 7407558
    Change-Id: I2034c8292414dc7db20a0c19951d44021389adea

commit 978d7e0eecf414300e1caee25b40f5f6901ea55c
Merge: 5040f60 fe5f3b9
Author: The Android Automerger <android-build@android.com>
Date:   Tue Oct 23 21:53:04 2012 -0700

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

commit 5040f60c9a23a63f0e8e5029ac1d0b73ac58d7d3
Author: Martijn Coenen <maco@google.com>
Date:   Tue Oct 23 20:51:03 2012 -0700

    Delay sending EE-wipe APDUs.

    Work around an issue where sending the wipe
    APDUs at the same time as the SE sends its
    HCI configuration to the NFCC can cause the
    persistent HCI state to become incorrect.

    Bug: 7387638
    Change-Id: I11a73e3ad7875c5b1d755efde0a7a803427b7468

commit fe5f3b974b0c03b6ef61f25165813e96d2d864d6
Merge: b340c6c a06fe0f
Author: The Android Automerger <android-build@android.com>
Date:   Tue Oct 23 14:37:39 2012 -0700

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

commit b340c6cb76ce38a28d0a775dfaeb027b364fe884
Author: Martijn Coenen <maco@google.com>
Date:   Tue Oct 23 11:43:02 2012 -0700

    Fix wrong Beam image scaling on sw600 and larger devices.

    On sw600 and larger, the navbar is at the bottom,
    not to the side.

    Bug: 7399926
    Change-Id: I825a1156995ec6e84faef16866dea4bf240a11c2

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

    Reset RF field status on SE activation.

    We've seen the NFCC get in a state where
    it continuously reports field off/field on
    events. The danger is that the device goes
    to sleep right after a field on event. On
    wake-up, the field off/field on loop is
    gone, and the device prevents any access
    to the SE from the DH because it thinks
    the field is still present.

    Bug: 7386840
    Change-Id: I87b681124078fe69c0244efd7b14ebe3ffd1c161

commit a06fe0f781ce78da29fe76669555f6c319e14fe6
Merge: dce0f82 923a30f
Author: The Android Automerger <android-build@android.com>
Date:   Tue Oct 16 17:31:06 2012 -0700

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

commit dce0f825ae357c2c87b5b3ee4b9b52b832900b16
Merge: 47dbe9f b034c8b
Author: Martijn Coenen <maco@google.com>
Date:   Tue Oct 16 16:02:05 2012 -0700

    Merge "Fix Beam animation for non-owner user." into jb-mr1-dev

commit 47dbe9f2bcc03107adf2be32864d81e192451d71
Merge: 14a3534 547b58f
Author: Evan Chu <evanchu@broadcom.com>
Date:   Tue Oct 16 10:50:30 2012 -0700

    am 547b58f4: Fix tag not deactivating to sleep during reconnect.

    * commit '547b58f41866671e0028ed6f395b34e271ce81b1':
      Fix tag not deactivating to sleep during reconnect.

commit 14a35342da905cffaf8a818a6354327fb77a532d
Merge: 81aa989 a15b24e
Author: Evan Chu <evanchu@broadcom.com>
Date:   Tue Oct 16 10:50:29 2012 -0700

    am a15b24e9: Check for invalid handle before configuring secure element.

    * commit 'a15b24e9e405b65b7523d8c80173b1c0d71e093e':
      Check for invalid handle before configuring secure element.

commit 547b58f41866671e0028ed6f395b34e271ce81b1
Author: Evan Chu <evanchu@broadcom.com>
Date:   Mon Oct 15 15:36:14 2012 -0400

    Fix tag not deactivating to sleep during reconnect.

    During reconnect, the JNI deactivates the tag to sleep mode
    and re-selects it.  Sometimes when the tag leaves the RF field, it
    deactivates to idle instead of sleep; causing subsequent select to fail.

    Author: Mark Gorodetzky

    Bug: 7357299
    Change-Id: Id774d0bc3b8e2cbcea93cd2ee061ffecfa821a1e

commit a15b24e9e405b65b7523d8c80173b1c0d71e093e
Author: Evan Chu <evanchu@broadcom.com>
Date:   Mon Oct 15 16:39:47 2012 -0400

    Check for invalid handle before configuring secure element.

    If handle is invalid, don't adjust secure element's listening
    parameter.  This prevents a warning message from stack.

    Use LLCP_MAX_MIU to prevent a warning message from stack.

    Bug: 7357666
    Change-Id: I79af30f7d3db1d597b46d8cf43991c9157359e10

commit b034c8b4aea76979cf7bce841dbb627eec507d3d
Author: Martijn Coenen <maco@google.com>
Date:   Mon Oct 15 21:07:19 2012 -0700

    Fix Beam animation for non-owner user.

    The Beam animation adds a system window on top
    of the current window stack, and does this
    from a process run as the owner user.

    Added required permission that allows showing the
    window for all users.

    Also added a glClear() to fix a rendering
    glitch on Manta.

    Bug: 7351616
    Bug: 7310663
    Change-Id: I06960ee9d843c2413fcfd36a81bc7161fed5ef98

commit 923a30fdd069f20d505d71ea66bf5e18e92d6df0
Merge: 81aa989 595c62b
Author: The Android Automerger <android-build@android.com>
Date:   Sat Oct 13 03:50:20 2012 -0700

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

commit 81aa9898af2f99506cb025e9d8e37252d80c42fa
Author: Martijn Coenen <maco@google.com>
Date:   Fri Oct 12 15:06:36 2012 -0700

    Don't hold a timed wakelock.

    We used to acquire a timed wakelock when either resuming
    or suspending. We don't want to take a timed wakelock
    when suspending, since we want to suspend asap, but also
    don't want to underlock the wakelock.

    Instead of taking a timed wakelock, just abort
    the process in case the NFC controller hangs.

    Bug: 7341879
    Change-Id: Ibd2f468264f60a39db3cb271a6f05c50dfb559bf

commit 595c62b57101fbc6192cdaa4631f3f74e5f2f4e9
Merge: 59f43ae f1c7e20
Author: The Android Automerger <android-build@android.com>
Date:   Thu Oct 11 16:26:56 2012 -0700

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

commit 59f43aefee220afd41baa97ce2043017c171be73
Merge: 1b40470 a949c74
Author: Martijn Coenen <maco@google.com>
Date:   Thu Oct 11 16:01:48 2012 -0700

    am a949c743: Fast-fail SE open if it\'s activated in listen mode.

    * commit 'a949c74321b17f8ef1c93692064969f60815c7e4':
      Fast-fail SE open if it's activated in listen mode.

commit 1b4047043526e88bcecb32f640d83e0d9a851128
Merge: ec490fa ae1b16c
Author: Paul Chaisson <pchaisson@broadcom.com>
Date:   Thu Oct 11 15:25:35 2012 -0700

    am ae1b16cf: (-s ours) Use RF_ACTIVATE/DEACTIVATE to generate RF events. (DO NOT MERGE)

    * commit 'ae1b16cf81e49a438b7a86efcdd8d83c1c0666d1':
      Use RF_ACTIVATE/DEACTIVATE to generate RF events. (DO NOT MERGE)

commit a949c74321b17f8ef1c93692064969f60815c7e4
Author: Martijn Coenen <maco@google.com>
Date:   Thu Oct 4 16:52:51 2012 -0700

    Fast-fail SE open if it's activated in listen mode.

    Users of the NFC-extras API usually want to talk
    to the SE once it has completed a transaction.
    The hard part is knowing when it is safe to connect
    to the SE, as it will break the connection to any
    reader. And when relinquishing the connection to
    the SE, the reader may find the device again and
    process another transaction.

    This patch adds the following two conditions
    for allowing to open the SE from the DH:

    1) The SE may not be activated in listen mode

    2) The RF field must have been off for at least 50 ms

    Bug: 7275484
    Change-Id: Ibde32a8e2aef045c17ab76ef08c72f96edfedaef

commit ae1b16cf81e49a438b7a86efcdd8d83c1c0666d1
Author: Paul Chaisson <pchaisson@broadcom.com>
Date:   Tue Oct 2 22:28:41 2012 -0400

    Use RF_ACTIVATE/DEACTIVATE to generate RF events. (DO NOT MERGE)

    Create the RF Events for SE transactions based on RF
    activations (listen mode and ISO-DEP only).

    Bug: 7276275
    Change-Id: Ibea0f64ba82ed31a7c582f6a44eb15abf25dda1c

commit f1c7e201955f6f8bccdf4a7be7b677f0c1120ad6
Merge: ec490fa 965cc60
Author: The Android Automerger <android-build@android.com>
Date:   Wed Oct 10 06:59:46 2012 -0700

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

commit 965cc60ab7eb069e2e2c415bd28270c52e81859b
Merge: 622209f 2a34c5f
Author: The Android Automerger <android-build@android.com>
Date:   Tue Oct 9 16:07:25 2012 -0700

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

commit 2a34c5fa671249276dcb6d7e49ba2c8a809c64c2
Merge: a9f1c76 622209f
Author: The Android Automerger <android-build@android.com>
Date:   Tue Oct 9 15:39:17 2012 -0700

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

commit ec490fae97254443feacf17a2bdb47b2bce74be0
Merge: a9f1c76 accbb8c
Author: Martijn Coenen <maco@google.com>
Date:   Tue Oct 9 15:38:32 2012 -0700

    am accbb8c9: Don\'t return target lost in case of NACK for T2T.

    * commit 'accbb8c908d764c5f0b8030480f3e84f0f319ff5':
      Don't return target lost in case of NACK for T2T.

commit accbb8c908d764c5f0b8030480f3e84f0f319ff5
Author: Martijn Coenen <maco@google.com>
Date:   Tue Oct 9 15:21:49 2012 -0700

    Don't return target lost in case of NACK for T2T.

    Causes applications such as TagInfo to report the tag
    as being lost. Also fixed a small memory leak triggered
    in this case.

    Bug: 7294613
    Change-Id: I260e02896e534b23de5c7e0278609e27a9a20e7f

commit 323beb60af83ad80d8020bdaab3ff94f523f9051
Merge: f08a77e 156c71e
Author: Steve Kondik <shade@chemlab.org>
Date:   Tue Oct 9 12:35:32 2012 -0700

    Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/packages/apps/Nfc into aosp-merge

commit a9f1c762f3ac37d68b8c504146e851043f03de07
Merge: 5eb0e4a 88913e6
Author: Martijn Coenen <maco@google.com>
Date:   Tue Oct 9 09:55:57 2012 -0700

    Merge "NFC changes for multi-user support." into jb-mr1-dev

commit 5eb0e4ad34d354ddc903479ba99c4272e19b1375
Author: Martijn Coenen <maco@google.com>
Date:   Mon Oct 8 23:33:17 2012 -0700

    Set EE wipe APDUs for NCI stack.

    The wipe APDUs are used to lock the Secure Element
    state whenever an app using the SE is deinstalled,
    when all userdata is removed, or on first boot of
    the device. This sequence is identical for both
    the NXP and NCI implementations.

    Bug: 7312675
    Change-Id: I746580985bc986ac159e0d294823f0dbe6d3404f

commit 88913e627332e95f916f59c826b075e7e5959d36
Author: Martijn Coenen <maco@google.com>
Date:   Fri Sep 14 15:01:07 2012 -0700

    NFC changes for multi-user support.

    - Instantiate full NfcService for user 0, light
      NfcApplication instance for other users

    - Invalidate component cache on user switch
    - Start all activities based on current logged in user
    - Query PM based on current logged in user
    - Only keep track of apps using the SE for the owner
    - Throw SecurityException on SE calls for non-owner users

    Bug: 6926465
    Change-Id: If686efd34825a1bdd86fc06234ac7402d44a2afa

commit 622209fd092b2ad5fd7e1bdb598e524e940b4bc2
Merge: b1ba0d2 344a165
Author: The Android Automerger <android-build@android.com>
Date:   Sun Oct 7 06:59:52 2012 -0700

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

commit b1ba0d2a520ee2c5543a2ae9e017e1ef424f9265
Merge: f4c1767 7bb9229
Author: Martijn Coenen <maco@google.com>
Date:   Fri Oct 5 10:48:45 2012 -0700

    am 7bb9229c: Merge "Increase default transceive timeout to SE to 30s." into jb-broadcom-nfc

    * commit '7bb9229c66e38ce9e3fbb8c5364ca3416e19c5bc':
      Increase default transceive timeout to SE to 30s.

commit f4c1767b90eb6c256743d653e3ec451959bd399f
Merge: 98f3f63 10dd44d
Author: Evan Chu <evanchu@broadcom.com>
Date:   Fri Oct 5 10:48:44 2012 -0700

    am 10dd44d3: NFA_HciAddStaticPipe()\'s parameters changed

    * commit '10dd44d39824fbccd8bf26871cb118b1475eb2f1':
      NFA_HciAddStaticPipe()'s parameters changed

commit 7bb9229c66e38ce9e3fbb8c5364ca3416e19c5bc
Merge: 10dd44d 07d1b6e
Author: Martijn Coenen <maco@google.com>
Date:   Fri Oct 5 10:47:38 2012 -0700

    Merge "Increase default transceive timeout to SE to 30s." into jb-broadcom-nfc

commit 344a1658b3689d3d490a06b7accf0ccd2e538490
Merge: 98f3f63 4d1500f
Author: The Android Automerger <android-build@android.com>
Date:   Fri Oct 5 07:00:11 2012 -0700

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

commit 07d1b6ea9f46d7118103cd0821ef7c86bfa9ee43
Author: Martijn Coenen <maco@google.com>
Date:   Thu Oct 4 22:51:38 2012 -0700

    Increase default transceive timeout to SE to 30s.

    We've found that executing some APDU commands
    may take longer than the current timeout of 10 seconds.

    Increase default transceive timeout to the SE to 30 seconds.

    Bug: 7004303
    Change-Id: I3e6855e79b7eceae9d2aa18b3f92c3efcdf4a9d6

commit 10dd44d39824fbccd8bf26871cb118b1475eb2f1
Author: Evan Chu <evanchu@broadcom.com>
Date:   Thu Oct 4 16:19:56 2012 -0400

    NFA_HciAddStaticPipe()'s parameters changed

    Bug: 7282057
    Change-Id: Ic877f67654906e21f1942adf05751943e3d6cb01

commit 98f3f63fa680fed66507399210ace05d64bf1d6c
Author: Paul Chaisson <pchaisson@broadcom.com>
Date:   Tue Oct 2 22:28:41 2012 -0400

    Use RF_ACTIVATE/DEACTIVATE to generate RF events.

    Create the RF Events for SE transactions based on RF
    activations (listen mode and ISO-DEP only).

    Change-Id: Ie8317292b0de05e1a406ca84c48491738acfe271
    Bug: 7276275

commit 4d1500fb6d5562bfb057707c0e3e76900a36e6e4
Merge: b2d09c0 9b1f485
Author: The Android Automerger <android-build@android.com>
Date:   Thu Oct 4 07:00:13 2012 -0700

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

commit f08a77e3dbce757eced6ab7cd171254c8b2c9522
Author: doug yeager <doug@simplytapp.com>
Date:   Wed Sep 26 10:38:56 2012 -0500

    on handsets where Gwallet is enabled, HCE turns off for good after Gwallet is fired up.  This patch fixes the scenario of Gwallet and HCE living happily together.  it is a fix, really, for the intended function of when an HCE application is in the forground, it has control, all other times Gwallet gets control of emulation from SE.

    Change-Id: I8c37e2799c3a2232f7cc1b18d1b40c6986e98e44

commit b2d09c062c2215c5e32c65efd62d372babcdf62a
Merge: fc388de 55b2c91
Author: mike wakerly <mikey@google.com>
Date:   Wed Oct 3 16:47:06 2012 -0700

    Merge "NfcAdapterExtras: add driver name." into jb-mr1-dev

commit fc388de82a3d26b31ceb4b7cb9ec147bf69cce21
Merge: ef953e2 c7d56f7
Author: Evan Chu <evanchu@broadcom.com>
Date:   Wed Oct 3 14:23:59 2012 -0700

    am c7d56f7e: Fix locking around power state.

    * commit 'c7d56f7e340c3c02359cac491e1a02156226975e':
      Fix locking around power state.

commit 55b2c9109e15be7965dd7b4385e6a68e47167e09
Author: mike wakerly <mikey@google.com>
Date:   Wed Oct 3 13:08:07 2012 -0700

    NfcAdapterExtras: add driver name.

    Bug: 7276355
    Change-Id: If2732afd542a68dc440308dae9eb76eb7ff31e25

commit c7d56f7e340c3c02359cac491e1a02156226975e
Author: Evan Chu <evanchu@broadcom.com>
Date:   Tue Oct 2 13:28:22 2012 -0400

    Fix locking around power state.

    Protect state against multi-threaded access.

    Bug: 7281263
    Change-Id: I12735c725b6abf956cb7143f25397653839bc6e4

commit 9b1f485b2e9024c9bd08c04a50341fe661f25062
Merge: ef953e2 04a2046
Author: The Android Automerger <android-build@android.com>
Date:   Wed Oct 3 07:00:12 2012 -0700

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

commit ef953e21ec44e2512ae2cae082d98cf8d492ef2a
Merge: a3bf4c3 e897cc4
Author: Paul Chaisson <pchaisson@broadcom.com>
Date:   Tue Oct 2 12:55:52 2012 -0700

    am e897cc40: Substitute empty select for configurable AID.

    * commit 'e897cc402e50a06ccd08b03c8942a2f17e46daef':
      Substitute empty select for configurable AID.

commit e897cc402e50a06ccd08b03c8942a2f17e46daef
Author: Paul Chaisson <pchaisson@broadcom.com>
Date:   Sun Sep 30 21:42:11 2012 -0400

    Substitute empty select for configurable AID.

    Workaround some SEs that do not support interpreting
    an empty select as a select of the card manager.

    Bug: 7198430
    Change-Id: Icce0e793ca6f03d5c2271812859b04417d2708e8

commit 04a2046f0199e173a5e9d7e019d49b04e253f9fd
Merge: a3bf4c3 28d98c6
Author: The Android Automerger <android-build@android.com>
Date:   Tue Oct 2 07:00:04 2012 -0700

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

commit a3bf4c351001569dccfba5ab4ed019b2ec03ca9b
Merge: 717dc3e 7379fb7
Author: Martijn Coenen <maco@google.com>
Date:   Mon Oct 1 14:05:56 2012 -0700

    am 7379fb73: Merge "Fix native crash during RF field notifications." into jb-broadcom-nfc

    * commit '7379fb73a8e88720977604d62983706b3c4391bf':
      Fix native crash during RF field notifications.

commit 7379fb73a8e88720977604d62983706b3c4391bf
Merge: 43727fb e8f4eba
Author: Martijn Coenen <maco@google.com>
Date:   Mon Oct 1 14:03:59 2012 -0700

    Merge "Fix native crash during RF field notifications." into jb-broadcom-nfc

commit e8f4eba219835c4c46af6be49a25f96679aea864
Author: Martijn Coenen <maco@google.com>
Date:   Mon Oct 1 12:13:56 2012 -0700

    Fix native crash during RF field notifications.

    Bug: 7264008
    Change-Id: I2647b0c6adf8f95e21d9f789c411742aef19c5ad

commit 28d98c6953885af59c60dedec48f2bc9743a82b9
Merge: 717dc3e 46353a8
Author: The Android Automerger <android-build@android.com>
Date:   Mon Oct 1 06:59:33 2012 -0700

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

commit 717dc3ec10d938b81989e2e5f5153b87551468d3
Merge: 1d79d84 43727fb
Author: Paul Chaisson <pchaisson@broadcom.com>
Date:   Sun Sep 30 22:03:59 2012 -0700

    am 43727fbb: Power up the NFCC when DH wants to talk to the SE.

    * commit '43727fbb7cc3b799a46c3d6ddeff24dd83081449':
      Power up the NFCC when DH wants to talk to the SE.

commit 1d79d84ba427b6cd2bfdd5b8b9a411847ad01d43
Merge: bdcdfc4 a80bb9a
Author: Evan Chu <evanchu@broadcom.com>
Date:   Sun Sep 30 21:55:47 2012 -0700

    am a80bb9a5: Do not activate a tag during NFC disable.

    * commit 'a80bb9a5333d4f4f749778f3a7b13b8c7ae58c6f':
      Do not activate a tag during NFC disable.

commit 43727fbb7cc3b799a46c3d6ddeff24dd83081449
Author: Paul Chaisson <pchaisson@broadcom.com>
Date:   Sun Sep 30 09:50:36 2012 -0400

    Power up the NFCC when DH wants to talk to the SE.

    We need to allow usecases were the DH wants to talk to
    the SE even if the screen is off.

    Bug: 7257431
    Change-Id: Iad66ef29757985b7aab5f0748fbf7589b3777bc3

commit a80bb9a5333d4f4f749778f3a7b13b8c7ae58c6f
Author: Evan Chu <evanchu@broadcom.com>
Date:   Fri Sep 28 12:20:35 2012 -0400

    Do not activate a tag during NFC disable.

    Could cause RF field to remain on.

    Bug: 7164846
    Change-Id: I82efc29b96c7129465fea5354fa5484da31618a6

commit 46353a80799731b6a9ead7961ef320915f2c2513
Merge: bdcdfc4 c420066
Author: The Android Automerger <android-build@android.com>
Date:   Sun Sep 30 07:00:07 2012 -0700

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

commit bdcdfc49616995d4e2a90521c22eac6eb909f88c
Merge: 70c3445 914d6ca
Author: Martijn Coenen <maco@google.com>
Date:   Fri Sep 28 12:38:14 2012 -0700

    am 914d6caa: Disable all RF activity when DH connects to SE.

    * commit '914d6caa70f544fb3dd0710de59dff090c695caa':
      Disable all RF activity when DH connects to SE.

commit c4200669d3514bcd2c349b216ec2c486b23afcde
Merge: 70c3445 1f1f49e
Author: The Android Automerger <android-build@android.com>
Date:   Thu Sep 27 07:00:20 2012 -0700

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

commit 914d6caa70f544fb3dd0710de59dff090c695caa
Author: Martijn Coenen <maco@google.com>
Date:   Wed Sep 26 13:09:20 2012 -0700

    Disable all RF activity when DH connects to SE.

    If we leave RF polling/listen enabled while talking
    to the SE from the DH, there is corruption on frames
    sent out over SWP. To resolve this, disable discovery
    (both poll and listen) when the SE is route to the DH.

    This also makes the behavior identical to that of
    the PN65N devices, which don't allow any RF activity
    when the SE is routed to the host.

    Bug: 7004303
    Change-Id: I05ad55a6f75b9f346feaf20dccefc23919ff538f

commit 70c3445ec1cea8278b61a556cf467591cd128348
Merge: 2e4fc72 18ccd96
Author: Martijn Coenen <maco@google.com>
Date:   Wed Sep 26 12:51:39 2012 -0700

    am 18ccd96a: Enable/disable RF discovery only when needed.

    * commit '18ccd96ac38d28864230f4f1d264fd1a4cc16d8a':
      Enable/disable RF discovery only when needed.

commit 2e4fc72b81880372344e36cd94e12da6122f7401
Merge: d7b6ee3 a112f9c
Author: Martijn Coenen <maco@google.com>
Date:   Wed Sep 26 11:04:09 2012 -0700

    am a112f9c0: Fix NFC->Bluetooth headset/a2dp connection.

    * commit 'a112f9c00e3337ef38ea8e1715a99db4966c7219':
      Fix NFC->Bluetooth headset/a2dp connection.

commit 18ccd96ac38d28864230f4f1d264fd1a4cc16d8a
Author: Martijn Coenen <maco@google.com>
Date:   Wed Sep 26 10:53:59 2012 -0700

    Enable/disable RF discovery only when needed.

    Fixes coming out of suspend with EE routing enabled.

    Bug: 7233312
    Change-Id: Ibbb9d7c26c2152fbac543d84d3306fc0ed50272d

commit 1f1f49e157106aa1e49f31ddfefe888f6c6d8213
Merge: d7b6ee3 7d53d8d
Author: The Android Automerger <android-build@android.com>
Date:   Wed Sep 26 07:00:11 2012 -0700

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

commit a112f9c00e3337ef38ea8e1715a99db4966c7219
Author: Martijn Coenen <maco@google.com>
Date:   Tue Sep 25 22:27:32 2012 -0700

    Fix NFC->Bluetooth headset/a2dp connection.

    The new BT stack has some changed behavior with respect
    to getProfileProxy() - it cannot be called before BT
    is enabled. Moved the proxy code into BluetoothHeadsetHandover
    and deal with it there.

    Bug: 7150073
    Change-Id: Ia227e0f6fa5639ed68379c751104ade82c893af6

commit d7b6ee314f297e1304a02ee6cdc5182586d0e98f
Merge: a89de4f 2f9909a
Author: Evan Chu <evanchu@broadcom.com>
Date:   Tue Sep 25 18:46:03 2012 -0700

    am 2f9909a2: Tell secure element to warm-reset when closing pipe to DH.

    * commit '2f9909a2ac0786983f3f564364053c56ef353819':
      Tell secure element to warm-reset when closing pipe to DH.

commit a89de4f0071efed877c38e4e24f11c9fc7f926ef
Merge: c15561c dc8a29d
Author: Evan Chu <evanchu@broadcom.com>
Date:   Tue Sep 25 18:46:02 2012 -0700

    am dc8a29da: Fix NXP PN544 controller interop with Broadcom controller

    * commit 'dc8a29dabea23ad526f767c4f6af949d626518d3':
      Fix NXP PN544 controller interop with Broadcom controller

commit c15561c2be87dec34f6b5df8db2e497c7b3f2604
Merge: 7314bbe 5b26e32
Author: Evan Chu <evanchu@broadcom.com>
Date:   Tue Sep 25 18:46:01 2012 -0700

    am 5b26e322: Don\'t try to set low-power mode if NFA_enable fails.

    * commit '5b26e322575a1c32595ec77cde3542a88065b2be':
      Don't try to set low-power mode if NFA_enable fails.

commit 2f9909a2ac0786983f3f564364053c56ef353819
Author: Evan Chu <evanchu@broadcom.com>
Date:   Tue Sep 25 18:45:46 2012 -0400

    Tell secure element to warm-reset when closing pipe to DH.

    Set HCI registry to cause Oberthur secure element to perform warm-reset.
    We use this to close any applets that the DH may have opened during
    communication to the SE.

    This feature is Oberthur-specific.

    Bug: 7163680
    Change-Id: Id0589b5b41bbea1df9b8dbd73abd5a112f773916

commit dc8a29dabea23ad526f767c4f6af949d626518d3
Author: Evan Chu <evanchu@broadcom.com>
Date:   Thu Sep 20 11:33:16 2012 -0400

    Fix NXP PN544 controller interop with Broadcom controller

    When NDEF detection times out, stop polling temporarily.
    Let NXP PN544 controller poll and activate the NFC-DEP interface.

    Bug: 6986507
    Change-Id: Iaa3194e4dbc4b9d2c16aaeb360a7f15dfd82c38a

commit 5b26e322575a1c32595ec77cde3542a88065b2be
Author: Evan Chu <evanchu@broadcom.com>
Date:   Mon Sep 24 23:36:46 2012 -0400

    Don't try to set low-power mode if NFA_enable fails.

    Would otherwise cause stack hang.

    Bug: 7214014
    Change-Id: I5a5373f389b06b873cee1c1fb694502d7ad598b3

commit 7d53d8d0c5903ec8c7da0ace4528a1ad5c2764cf
Author: Martijn Coenen <maco@google.com>
Date:   Thu Sep 20 20:42:52 2012 -0700

    Don't hold the routing wakelock longer than a minute.

    Until we figure out why routing gets stuck, don't hold
    the wakelock indefinitely.

    Bug: 7113095
    Change-Id: If4d1ed8d8855e2b50ddae6d06e886faf0d58db6d

commit 7314bbedd6b1964f2082133f4c5dedc48cb8f986
Merge: 5cb4232 04b8291
Author: Martijn Coenen <maco@google.com>
Date:   Fri Sep 21 11:04:32 2012 -0700

    Merge "Don't hold the routing wakelock longer than a minute." into jb-mr1-dev

commit 04b8291cd90635741c1a93cd19024cf07fe0dca8
Author: Martijn Coenen <maco@google.com>
Date:   Thu Sep 20 20:42:52 2012 -0700

    Don't hold the routing wakelock longer than a minute.

    Until we figure out why routing gets stuck, don't hold
    the wakelock indefinitely.

    Bug: 7113095
    Change-Id: If4d1ed8d8855e2b50ddae6d06e886faf0d58db6d

commit 435d7aa4012bded7b1b018843875ef2fbf7eaf2c
Merge: 5cb4232 5661fe3
Author: The Android Automerger <android-build@android.com>
Date:   Fri Sep 21 07:00:19 2012 -0700

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

commit 5cb4232d98a8359b38d657d6855f0badfec6f021
Merge: 2cd4a00 46974c0
Author: Martijn Coenen <maco@google.com>
Date:   Thu Sep 20 20:42:47 2012 -0700

    am 46974c09: Don\'t print error for resetting SE route.

    * commit '46974c09ec89cea00242bb94fe8a3a356b239c18':
      Don't print error for resetting SE route.

commit 46974c09ec89cea00242bb94fe8a3a356b239c18
Author: Martijn Coenen <maco@google.com>
Date:   Thu Sep 20 19:39:50 2012 -0700

    Don't print error for resetting SE route.

    Bug: 7113095
    Change-Id: Iaa2e2b05244ec10392c98aa5dd0d5ee84e62e39f

commit 2cd4a00810b6d7de2189dd37698127329d7c9d7f
Merge: e32740a 0873b05
Author: Evan Chu <evanchu@broadcom.com>
Date:   Thu Sep 20 13:30:04 2012 -0700

    am 0873b051: Grant license

    * commit '0873b0517eb1ab968be90f66f0b3cdbbeb62f78c':
      Grant license

commit e32740a51a9cfb67166c9a1ab1fa4475dcbe7e00
Merge: eec15a2 b95ef0b
Author: Evan Chu <evanchu@broadcom.com>
Date:   Thu Sep 20 12:46:43 2012 -0700

    am b95ef0b6: copyright by The Android Open Source Project

    * commit 'b95ef0b6e86a4fcfe2474ccaea0925f69a462bec':
      copyright by The Android Open Source Project

commit 0873b0517eb1ab968be90f66f0b3cdbbeb62f78c
Author: Evan Chu <evanchu@broadcom.com>
Date:   Thu Sep 20 14:39:22 2012 -0400

    Grant license

    Bug: 7125646
    Change-Id: If700eb3cdd85e9ee08701d2dd8971ce2500a834d

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

    copyright by The Android Open Source Project

    Bug: 7125646
    Change-Id: I4de457f982857be315d65386f431d5eafcd8af02

commit 5661fe3fac658f5de23465fea6dfc54df7d6fcb6
Merge: eec15a2 deb2a2c
Author: The Android Automerger <android-build@android.com>
Date:   Wed Sep 19 07:01:46 2012 -0700

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

commit eec15a2576fe8c6abf986996d6be20ae5b6afcfe
Merge: 8676119 b64ce36
Author: Martijn Coenen <maco@google.com>
Date:   Tue Sep 18 19:30:51 2012 -0700

    Merge "Merge NFCEE wakelocks." into jb-mr1-dev

commit 867611966d9f9ed429cb219eadfb7a476624ca98
Merge: f0d8db6 7be608b
Author: Martijn Coenen <maco@google.com>
Date:   Tue Sep 18 19:20:53 2012 -0700

    am 7be608bc: Fix locking in PeerToPeer.

    * commit '7be608bcc4495aafcb700aa61072050fdc96f3e8':
      Fix locking in PeerToPeer.

commit b64ce3632295a51a83f0d6b2aae7a5d357eaa86d
Author: Martijn Coenen <maco@google.com>
Date:   Tue Sep 18 18:08:36 2012 -0700

    Merge NFCEE wakelocks.

    These were just in for debugging.

    Bug: 6963484
    Change-Id: Iac4b9185a615243783614429869f3f34b5cba82f

commit 7be608bcc4495aafcb700aa61072050fdc96f3e8
Author: Martijn Coenen <maco@google.com>
Date:   Mon Sep 17 17:28:40 2012 -0700

    Fix locking in PeerToPeer.

    The PeerToPeer class had some serious multi-threading issues:
    - mServers / mClients simultaneously being accessed by different threads
    - P2pServer / P2pClient objects being deleted while still being used by
      other threads
    - Race conditions where we could go to sleep on a condition variable
      without ever waking up.

    This fixes most of the issues by:
    - Properly locking all access to mServers / mClients
    - Using Android's sp mechanism to do ref counting on P2pServer/P2pClient/NfaConn

    TODO:
    - Fix races around the condition variables - those are very hard to hit,
      but we need them fixed anyway.

    Bug: 7089048
    Change-Id: I08564c65cc40734086e517d6107e31f86c3b6adc

commit f0d8db6acc4b186360bbd092de40a3a0c8f8d86f
Merge: eecb57f c6cf8e4
Author: Evan Chu <evanchu@broadcom.com>
Date:   Tue Sep 18 17:07:13 2012 -0700

    am c6cf8e45: Integrate NFC Hardware Abstraction Layer.

    * commit 'c6cf8e45c27d8a43d09b997cc223e8068d140edd':
      Integrate NFC Hardware Abstraction Layer.

commit c6cf8e45c27d8a43d09b997cc223e8068d140edd
Author: Evan Chu <evanchu@broadcom.com>
Date:   Thu Sep 13 17:43:41 2012 -0400

    Integrate NFC Hardware Abstraction Layer.

    Bug: 7123942
    Change-Id: I4fa153b80e1af2b00b326370e102f714cde4334b

commit deb2a2c1a7fa0d18382b9d1cf3fe967b232c4562
Merge: eecb57f 435616c
Author: The Android Automerger <android-build@android.com>
Date:   Wed Sep 12 07:00:16 2012 -0700

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

commit eecb57f35b060bda1b2e1acb709a513d8941b576
Merge: c7711f3 bd233c4
Author: Martijn Coenen <maco@google.com>
Date:   Tue Sep 11 12:27:17 2012 -0700

    am bd233c44: Merge "User proper error code during tag reading" into jb-broadcom-nfc

    * commit 'bd233c444ac568b408880e5d5578500ef4c0578c':
      User proper error code during tag reading

commit c7711f31668acccf5ba2377d05d509acc418b1d3
Merge: 565d146 a960b02
Author: Martijn Coenen <maco@google.com>
Date:   Tue Sep 11 12:27:17 2012 -0700

    am a960b02c: Merge "Use correct app name for NFA_HciDeregister()" into jb-broadcom-nfc

    * commit 'a960b02cc3f830d7e8dfc2a5b929aec5a23c7bab':
      Use correct app name for NFA_HciDeregister()

commit 565d146bde7a6fcee4e597fbd7e67a4841ad72ed
Merge: 9fecbe8 cf72e2c
Author: Evan Chu <evanchu@broadcom.com>
Date:   Tue Sep 11 12:27:16 2012 -0700

    am cf72e2c3: Fix NFC low-power modes.

    * commit 'cf72e2c30b6f0006068a3fa2ba02dba4917e7fb6':
      Fix NFC low-power modes.

commit bd233c444ac568b408880e5d5578500ef4c0578c
Merge: a960b02 643bf71
Author: Martijn Coenen <maco@google.com>
Date:   Tue Sep 11 12:26:00 2012 -0700

    Merge "User proper error code during tag reading" into jb-broadcom-nfc

commit a960b02cc3f830d7e8dfc2a5b929aec5a23c7bab
Merge: cf72e2c 0056bce
Author: Martijn Coenen <maco@google.com>
Date:   Tue Sep 11 12:25:44 2012 -0700

    Merge "Use correct app name for NFA_HciDeregister()" into jb-broadcom-nfc

commit 643bf71c665fd08b5a5cd367a8baa2da52116c64
Author: Evan Chu <evanchu@broadcom.com>
Date:   Wed Sep 5 10:14:19 2012 -0400

    User proper error code during tag reading

    When reading a tag and it does not respond to a command, use taglost=1.
    It causes a TagLostException in the app.

    Bug: 7047415
    Change-Id: I766849991441b82e5ad03d3031bc735fa5f9c27a

commit 0056bce9a6b688959e94b70cc80fb8ae331d9af9
Author: Evan Chu <evanchu@broadcom.com>
Date:   Mon Sep 10 11:07:13 2012 -0400

    Use correct app name for NFA_HciDeregister()

    The "app name" parameters must match in HciDregister() and
    HciRegister()

    Change-Id: I43010268bb4c0ee7cdc7c1440346a6dedc230a58

commit 435616c54ce28b5024a942595cc1fce62f78b863
Merge: 26749e2 36693e5
Author: The Android Automerger <android-build@android.com>
Date:   Sun Sep 9 07:01:15 2012 -0700

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

commit 9fecbe852683f1bae8dc789c089028acc1ddae20
Author: Doris Liu <tianliu@google.com>
Date:   Fri Sep 7 14:18:30 2012 -0700

    Add FLAG_ACTIVITY_NEW_TASK to viewIntent

    The previous CL that set FLAG_ACTIVITY_NEW_TASK flag in pendingIntent did not fix the bug. The flag needs to be set in the view intent.

    Bug: 6925612
    Change-Id: Ibe5892c575fdf904c800c726122c59be6af02685

commit cf72e2c30b6f0006068a3fa2ba02dba4917e7fb6
Author: Evan Chu <evanchu@broadcom.com>
Date:   Fri Aug 31 09:20:55 2012 -0400

    Fix NFC low-power modes.

    At the end of nfcManager_doInitialize(), enter low-power mode.
    This logic is used after boot and before the user unlocks the screen.
    If the user does not unlock the screen, the phone stays in low-power mode.

    Additionally, only power off the chip if discovery is disabled
    AND the SE is not selected.

    Change-Id: I2bd2effce34b5dc586ad484c1da2ae86da49f0c1

commit 26749e2629882623217394b5b81950a4e04403fa
Merge: dbc2f87 2bc1792
Author: Paul Chaisson <pchaisson@broadcom.com>
Date:   Fri Sep 7 03:57:17 2012 -0700

    am 2bc17929: Use NFA_DM_DISC_DURATION_POLL from config file.

    * commit '2bc17929536528973571087813cb9746ea4947a6':
      Use NFA_DM_DISC_DURATION_POLL from config file.

commit 2bc17929536528973571087813cb9746ea4947a6
Author: Paul Chaisson <pchaisson@broadcom.com>
Date:   Thu Sep 6 23:54:55 2012 -0400

    Use NFA_DM_DISC_DURATION_POLL from config file.

    Use the poll duration ("NFA_DM_DISC_DURATION_POLL")
    from the conf file if one is configured.

    Change-Id: If17d402cbe8505b096a168640f99b88f7e3b6e48

commit dbc2f8731681f6cd903160f0ddb4ebbc655c20c2
Merge: 6ad6da1 cdf5b0e
Author: Martijn Coenen <maco@google.com>
Date:   Fri Sep 7 03:49:08 2012 -0700

    am cdf5b0e0: Remove old NPP->SNEP redirect code.

    * commit 'cdf5b0e0c3cdd1b60a212fd4df510fb1e50bcbe5':
      Remove old NPP->SNEP redirect code.

commit 6ad6da12090b4a51dc944a1fa4434afb970185f0
Merge: cff4b0c f9f309b
Author: Martijn Coenen <maco@google.com>
Date:   Thu Sep 6 08:21:47 2012 -0700

    Merge "Do not dispatch empty NDEF tags as NDEF_DISCOVERED." into jb-mr1-dev

commit cff4b0c30c21af65fb9f3fe2606d1e62bc29af1b
Merge: 15890a0 3463d49
Author: Evan Chu <evanchu@broadcom.com>
Date:   Thu Sep 6 08:19:01 2012 -0700

    am 3463d49a: Correct spelling.

    * commit '3463d49a81556279bb0c4c74d9f4c9fd49ee61af':
      Correct spelling.

commit 15890a0c6fcce207e25a9f9357f194b3297fca41
Merge: 343c344 7e5bdc9
Author: Evan Chu <evanchu@broadcom.com>
Date:   Thu Sep 6 08:19:00 2012 -0700

    am 7e5bdc93: correctly handle P2P congestion event

    * commit '7e5bdc93fb55d2090c4b32bff811abf4c39b2e52':
      correctly handle P2P congestion event

commit 343c3441c8fcbb0ecc410c12ac9dc862f0d84d9f
Merge: e0e8b48 08030f1
Author: Evan Chu <evanchu@broadcom.com>
Date:   Thu Sep 6 08:18:59 2012 -0700

    am 08030f1c: handle NACK, ACK for Mifare Ultralight

    * commit '08030f1c2a13eca1acc67b9d0763a3b6a2706f02':
      handle NACK, ACK for Mifare Ultralight

commit e0e8b48d0042eb43473b6e56be7d11b97c3315a4
Merge: a396754 cf83b53
Author: Martijn Coenen <maco@google.com>
Date:   Thu Sep 6 08:18:58 2012 -0700

    am cf83b532: Merge "Remove "brcm" in names" into jb-broadcom-nfc

    * commit 'cf83b532b9f3fec2a9b95ccc7bccf91526cf0b31':
      Remove "brcm" in names

commit f9f309b683526876dae196a706ac520f05eb22c0
Author: Martijn Coenen <maco@google.com>
Date:   Thu Sep 6 16:45:16 2012 +0200

    Do not dispatch empty NDEF tags as NDEF_DISCOVERED.

    To avoid encouraging sloppy filtering. This was
    actually already the behavior pre-JB.

    Change-Id: I556f250db086b70345123a151378728080b4779c

commit 36693e5685a7c41a4f06aafb764ae0e213296280
Merge: a396754 48f3e2b
Author: The Android Automerger <android-build@android.com>
Date:   Thu Sep 6 06:34:38 2012 -0700

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

commit cdf5b0e0c3cdd1b60a212fd4df510fb1e50bcbe5
Author: Martijn Coenen <maco@google.com>
Date:   Thu Sep 6 10:21:54 2012 +0200

    Remove old NPP->SNEP redirect code.

    This code was used when Android did not support
    SNEP natively yet. The current Android behavior
    is to automatically try SNEP first, then fall back
    to NPP.

    Change-Id: Ifb1df3a5439cc1a7b939b4ae1dc70135d9c63a25

commit 3463d49a81556279bb0c4c74d9f4c9fd49ee61af
Author: Evan Chu <evanchu@broadcom.com>
Date:   Wed Sep 5 11:37:08 2012 -0400

    Correct spelling.

    Change-Id: Ie747c06a0a5161ad5479f93cbc56e482ed7da33c

commit 7e5bdc93fb55d2090c4b32bff811abf4c39b2e52
Author: Evan Chu <evanchu@broadcom.com>
Date:   Wed Sep 5 11:30:46 2012 -0400

    correctly handle P2P congestion event

    Correctly handle NFA_P2P_CONGEST_EVT to prevent race condition.

    Change-Id: If255ade96867d45b2a7cff1cb3d6e4cbc2d883d3

commit 08030f1c2a13eca1acc67b9d0763a3b6a2706f02
Author: Evan Chu <evanchu@broadcom.com>
Date:   Wed Sep 5 11:34:14 2012 -0400

    handle NACK, ACK for Mifare Ultralight

    BLTH01652900: During trasceive operation for Mifare Ultralight, handle
    NACK and ACK responses properly

    Bug: 7047415
    Change-Id: I778a2bbbcd3fff47b0da73ec37d76bf81708d931

commit cf83b532b9f3fec2a9b95ccc7bccf91526cf0b31
Merge: db216e6 01bd745
Author: Martijn Coenen <maco@google.com>
Date:   Thu Sep 6 01:37:29 2012 -0700

    Merge "Remove "brcm" in names" into jb-broadcom-nfc

commit 01bd745d05c678e5ab768b7972dcbe7519be2149
Author: Evan Chu <evanchu@broadcom.com>
Date:   Wed Sep 5 11:18:29 2012 -0400

    Remove "brcm" in names

    BLTH01642677. Remove "brcm" in names.

    Change-Id: Ic3a08abfeb2808d2a0b01402a76d9864b099ef49

commit a396754698497971bfa0d7725b6866349f3af6e4
Merge: 9ad7210 db216e6
Author: Martijn Coenen <maco@google.com>
Date:   Thu Sep 6 00:37:20 2012 -0700

    am db216e63: Add FLAG_ACTIVITY_NEW_TASK to Beam Handover intent.

    * commit 'db216e63dad45973ff4992098229208a518d658f':
      Add FLAG_ACTIVITY_NEW_TASK to Beam Handover intent.

commit 48f3e2beb1b07161d4ad2d25026eeeea94b000be
Merge: 9ad7210 1f28717
Author: The Android Automerger <android-build@android.com>
Date:   Tue Sep 4 06:33:26 2012 -0700

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

commit db216e63dad45973ff4992098229208a518d658f
Author: Martijn Coenen <maco@google.com>
Date:   Tue Sep 4 11:17:52 2012 +0200

    Add FLAG_ACTIVITY_NEW_TASK to Beam Handover intent.

    Bug: 6925612
    Change-Id: I37f49a150c4fc1763b2121e46fedf79d662b0a2b

commit 9ad72102a50635064cd9a2eb936d582ae6a35777
Merge: 5c80e2f f340f1a
Author: Evan Chu <evanchu@broadcom.com>
Date:   Tue Sep 4 01:25:04 2012 -0700

    am f340f1a0: Upgrade to stack NFA_MI_1.03.36

    * commit 'f340f1a071a54c6ea4644fcef45c784a9be3c19a':
      Upgrade to stack NFA_MI_1.03.36

commit 8efb854312c0a8526e70cf72d06cff598c7c2104
Merge: bbeb59b 36c83c8
Author: Steve Kondik <shade@chemlab.org>
Date:   Fri Aug 31 12:03:52 2012 +0400

    Merge "card emulation patch port to JB" into jellybean

commit f340f1a071a54c6ea4644fcef45c784a9be3c19a
Author: Evan Chu <evanchu@broadcom.com>
Date:   Tue Aug 28 13:08:20 2012 -0400

    Upgrade to stack NFA_MI_1.03.36

    Change-Id: I79510a45e8a552626f0473000e23d0fc6888ee33

commit 1f28717eeea6f09c216a88fb2f840c4f23765445
Merge: 5c80e2f d5498fb
Author: The Android Automerger <android-build@android.com>
Date:   Wed Aug 29 06:34:17 2012 -0700

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

commit 36c83c8e17e8500e2d68ed5b3342fa3de916df54
Author: doug yeager <doug@simplytapp.com>
Date:   Thu Aug 23 10:28:04 2012 -0500

    card emulation patch port to JB

    Change-Id: I9d6ed9b15da69a346936cb4288c1cf5c7438ae87

commit 5c80e2f6f327ba1bc13d5bad86a8d25bf1982554
Merge: abec140 8e9cdd7
Author: Evan Chu <evanchu@broadcom.com>
Date:   Tue Aug 28 07:23:15 2012 -0700

    am 8e9cdd78: Create JavaClassConstants.h to store some global names

    * commit '8e9cdd7891bc1d6589b6d51b7c39efc87a64ba5e':
      Create JavaClassConstants.h to store some global names

commit abec14019cb2250cad63fbf9960cce17f4642017
Merge: 8a3d763 dfc52b4
Author: Evan Chu <evanchu@broadcom.com>
Date:   Tue Aug 28 07:23:14 2012 -0700

    am dfc52b4b: In SyncEvent class, only unlock mutex once

    * commit 'dfc52b4bafc435e72d25aaba736612352bfd0581':
      In SyncEvent class, only unlock mutex once

commit 8e9cdd7891bc1d6589b6d51b7c39efc87a64ba5e
Author: Evan Chu <evanchu@broadcom.com>
Date:   Fri Aug 17 12:36:09 2012 -0400

    Create JavaClassConstants.h to store some global names

    Create JavaClassConstants.h to store some global names

    Change-Id: I918d9e8f6db646f637cddbebbc2c4e5c5495623d

commit d5498fb0d509e578c8ca40ee4b4bc9c4f5b0db01
Merge: 8a3d763 38236a7
Author: The Android Automerger <android-build@android.com>
Date:   Tue Aug 28 06:34:23 2012 -0700

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

commit dfc52b4bafc435e72d25aaba736612352bfd0581
Author: Evan Chu <evanchu@broadcom.com>
Date:   Fri Aug 17 10:41:21 2012 -0400

    In SyncEvent class, only unlock mutex once

    In SyncEvent class, only unlock mutex once.

    Change-Id: I0fb797c9e6e8ea793fd38abd72a0c2780a734e95

commit 8a3d7631318ea08585d4cfa1d71fc84ece00fdec
Merge: b7a8d9c d1235cf
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 28 01:47:47 2012 -0700

    am d1235cf7: Don\'t report empty NDEF tags as formattable.

    * commit 'd1235cf7c2d0839264ccf90e9be7e19b66b58b6a':
      Don't report empty NDEF tags as formattable.

commit d1235cf7c2d0839264ccf90e9be7e19b66b58b6a
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 28 10:39:39 2012 +0200

    Don't report empty NDEF tags as formattable.

    This was regression from a JB change.

    Change-Id: Idbd92abf797478ec827dc26d6e825e2a6805356d

commit 38236a724ebd08f847f9c0468947107c8fe0b5a8
Merge: b7a8d9c a71b103
Author: The Android Automerger <android-build@android.com>
Date:   Mon Aug 27 06:34:46 2012 -0700

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

commit b7a8d9cecfc673601efc4daebb8fe3cd6a66238a
Merge: 22b1a30 59ff0d6
Author: Evan Chu <evanchu@broadcom.com>
Date:   Thu Aug 23 22:46:58 2012 -0700

    am 59ff0d6e: During nfcManager_disableDiscovery() go to power-off-sleep mode.

    * commit '59ff0d6e6f4de4703a4489144a4311405eeead5a':
      During nfcManager_disableDiscovery() go to power-off-sleep mode.

commit 59ff0d6e6f4de4703a4489144a4311405eeead5a
Author: Evan Chu <evanchu@broadcom.com>
Date:   Thu Aug 23 17:46:51 2012 -0400

    During nfcManager_disableDiscovery() go to power-off-sleep mode.

    BLTH01634648: During nfcManager_disableDiscovery() go to
    power-off-sleep mode when secure element is not selected.

    Change-Id: I85c37fa635a90fdc8c90b5a86fe1d3e091d421d4

commit a71b10388682222c565fd128de5ceaa7241c089c
Merge: 22b1a30 827c72f
Author: The Android Automerger <android-build@android.com>
Date:   Mon Aug 20 06:35:36 2012 -0700

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

commit 22b1a3096cdb66ba2fbc540e1a8cacce701c6d82
Author: Jeff Brown <jeffbrown@google.com>
Date:   Sun Aug 19 20:05:02 2012 -0700

    Use new display manager API.

    Change-Id: I4d40a33bf11379845464f4072471c168f9dccf75

commit 34a9f499db13223c1a55a61f7b624fe821574742
Merge: 3ebf259 e8e4909
Author: Martijn Coenen <maco@google.com>
Date:   Thu Aug 16 17:38:01 2012 -0700

    am e8e49093: Log NFC controller firmware version.

    * commit 'e8e49093826aa8309f4e16e5cd02174829e0310a':
      Log NFC controller firmware version.

commit e8e49093826aa8309f4e16e5cd02174829e0310a
Author: Martijn Coenen <maco@google.com>
Date:   Thu Aug 16 17:35:26 2012 -0700

    Log NFC controller firmware version.

    ALOGD is now squelched by default. Moved it to ALOGE.

    Change-Id: I3bb7601e65d01d8d01a95902a0be95c7e1a3426f

commit 3ebf2591dba46e30f1af03b6bfd180250f2e7e39
Merge: d8bfcc0 72a693f
Author: Evan Chu <evanchu@broadcom.com>
Date:   Thu Aug 16 15:00:07 2012 -0700

    am 72a693f6: Remove unused functions; correct spelling

    * commit '72a693f626c4c766f8f8d835c28643252301fef5':
      Remove unused functions; correct spelling

commit d8bfcc0f30e62a5d707a7e22edc9d0f0ee32e84d
Merge: d422cc4 55dbe42
Author: Evan Chu <evanchu@broadcom.com>
Date:   Thu Aug 16 15:00:06 2012 -0700

    am 55dbe428: Remove gJniVersion; add thread-synchronization

    * commit '55dbe428a7134ec82c5356f4f8e5fd7778374509':
      Remove gJniVersion; add thread-synchronization

commit 72a693f626c4c766f8f8d835c28643252301fef5
Author: Evan Chu <evanchu@broadcom.com>
Date:   Thu Aug 16 17:26:52 2012 -0400

    Remove unused functions; correct spelling

    Remove unused functions; correct spelling

    Change-Id: I6ecf17f8cf8eeae831ba3fcc0a2eb492332c0cb6

commit 55dbe428a7134ec82c5356f4f8e5fd7778374509
Author: Evan Chu <evanchu@broadcom.com>
Date:   Mon Aug 13 15:34:30 2012 -0400

    Remove gJniVersion; add thread-synchronization

    Remove gJniVersion.  Add thread-synchronization for obtaining a new JNI handle.

    Change-Id: I23e05c95fd90005f6ef1cac69e1e07f0b9612227

commit d422cc4318d9e8729d05221ff415d3b5c1073a33
Merge: 09f277a 5e10045
Author: Martijn Coenen <maco@google.com>
Date:   Thu Aug 16 13:53:38 2012 -0700

    am 5e100450: Don\'t call applyRouting on disable().

    * commit '5e100450dac446c851690af1a522446fa406e4ad':
      Don't call applyRouting on disable().

commit 5e100450dac446c851690af1a522446fa406e4ad
Author: Martijn Coenen <maco@google.com>
Date:   Thu Aug 16 13:47:49 2012 -0700

    Don't call applyRouting on disable().

    Original patch from Chih-Weih Huang <cw_huang@htc.com>.

    Change-Id: I15b129d318d125cf67aba83d16441c6d52bb193a

commit 827c72f7291afed8294c1611d74ccca84b2b2ac8
Merge: 09f277a d744b4d
Author: The Android Automerger <android-build@android.com>
Date:   Thu Aug 16 06:34:33 2012 -0700

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

commit 09f277a0cfae46514e032e7cc82645751782922e
Merge: e4e35b7 7de0211
Author: Evan Chu <evanchu@broadcom.com>
Date:   Wed Aug 15 11:16:47 2012 -0700

    am 7de0211f: Reduce compilation warnings in NFC JNI.

    * commit '7de0211f2c47500f921634d9af18900826000616':
      Reduce compilation warnings in NFC JNI.

commit 7de0211f2c47500f921634d9af18900826000616
Author: Evan Chu <evanchu@broadcom.com>
Date:   Tue Aug 14 17:48:35 2012 -0400

    Reduce compilation warnings in NFC JNI.

    Change-Id: Iba0dab66be054ca1b0bc0f477c1107909df65cda

commit d744b4dbb952c45b3f9d172417a8c077d855da16
Merge: e4e35b7 deb6d32
Author: The Android Automerger <android-build@android.com>
Date:   Tue Aug 14 07:07:49 2012 -0700

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

commit e4e35b706b37e67b3f15af13f19eae5c9aa1a41f
Merge: 38a306e 5c7b8d9
Author: Evan Chu <evanchu@broadcom.com>
Date:   Mon Aug 13 16:52:44 2012 -0700

    am 5c7b8d9b: Remove whitespace from NFC NCI JNI.

    * commit '5c7b8d9beeb46cba30bffaf94945ef6fc55e8a76':
      Remove whitespace from NFC NCI JNI.

commit deb6d32210c12c67bbd6e22de617b189b53d99a2
Merge: 38a306e 7ef7188
Author: The Android Automerger <android-build@android.com>
Date:   Mon Aug 13 08:10:04 2012 -0700

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

commit 5c7b8d9beeb46cba30bffaf94945ef6fc55e8a76
Author: Evan Chu <evanchu@broadcom.com>
Date:   Fri Aug 10 17:42:09 2012 -0400

    Remove whitespace from NFC NCI JNI.

    - Logging changes
    - Upgrade to stack NFA_MI_1.03.33

    Change-Id: Iba2af1af49a261de50f79572b478838e2bdc890f

commit bbeb59b6dec85cb612900b7d65abd3bac6877461
Merge: 7c2d3ef fd4b41a
Author: Steve Kondik <shade@chemlab.org>
Date:   Fri Aug 10 01:36:14 2012 -0700

    Merge branch 'jb-release' of https://android.googlesource.com/platform/packages/apps/Nfc into aosp

commit 38a306e1c5e5cbe7dfc896843bc9681c12e4d7f2
Merge: e2b2956 c6cdbf2
Author: mike wakerly <mikey@google.com>
Date:   Thu Aug 9 17:39:04 2012 -0700

    am c6cdbf21: NfcService: hold a wake lock around transceive().

    * commit 'c6cdbf21958178025010c6bed797ff193c89884f':
      NfcService: hold a wake lock around transceive().

commit c6cdbf21958178025010c6bed797ff193c89884f
Author: mike wakerly <mikey@google.com>
Date:   Thu Aug 2 15:45:47 2012 -0700

    NfcService: hold a wake lock around transceive().

    Bug: 6629750
    Change-Id: Idee36983952b4ba593464f72188c6fb702c59f7f

commit e2b295643d102a2a7f768137293515d9f9c22363
Merge: 813d6cd 341fbf4
Author: Martijn Coenen <maco@google.com>
Date:   Thu Aug 9 12:05:59 2012 -0700

    am 341fbf46: Support for setting p2p target/initiator modes in NCI.

    * commit '341fbf46e459073c929cb20fcb231ad981b0c67d':
      Support for setting p2p target/initiator modes in NCI.

commit 341fbf46e459073c929cb20fcb231ad981b0c67d
Author: Martijn Coenen <maco@google.com>
Date:   Wed Aug 8 17:19:06 2012 -0700

    Support for setting p2p target/initiator modes in NCI.

    Allows selectively enabling / disabling p2p modes in the
    NCI stack.

    TODO:
    - Support selecting individual Nfc-F speeds (212/424).
    - Support disabling initiator Nfc-A / Nfc-F just for NFC-DEP.

    Change-Id: I55a08bd83640b45e2d8346587031f49213a0860b

commit 7ef718861a93d376042429510b9aad1bf7f237ab
Merge: 813d6cd 0712650
Author: The Android Automerger <android-build@android.com>
Date:   Thu Aug 9 09:29:58 2012 -0700

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

commit 813d6cd48f4699f79acd873533dbcdce2fa0b2be
Merge: a81a908 3c47e69
Author: Elliott Hughes <enh@google.com>
Date:   Wed Aug 8 10:36:04 2012 -0700

    am 3c47e69e: Fix one last user of astl to use stlport instead...

    * commit '3c47e69e330d6d2890afae3b0b447954fbb97911':
      Fix one last user of astl to use stlport instead...

commit a81a90813f9282a708733cecdd2968d874ea1c1d
Merge: 788ec0d 8d6ea79
Author: Martijn Coenen <maco@google.com>
Date:   Wed Aug 8 10:36:03 2012 -0700

    am 8d6ea79d: Allow different default MIU / window sizes.

    * commit '8d6ea79dad7c25f592722faf47709e1b918d4c21':
      Allow different default MIU / window sizes.

commit 788ec0df0882e09cd3968937277186ec0e2f89fa
Merge: 9326e19 2d57efb
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 8 10:36:02 2012 -0700

    am 2d57efb7: (-s ours) am 0e8be1f8: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '2d57efb70a92553623370786bfede151603d3305':

commit 9326e19a23cc41c1a5599a3333dae5eaa4d16497
Merge: 408a586 bb3c38a
Author: Martijn Coenen <maco@google.com>
Date:   Wed Aug 8 10:36:01 2012 -0700

    am bb3c38ae: am 295c9c25: am 484d6a32: am bb65a8d8: Allow NfcB connects in NCI stack.

    * commit 'bb3c38aec1fef674ce2ec462e7ce463963985800':

commit 408a5864f45de1bb2e66eedeb8f7d6c9805837c9
Merge: 5e70c00 74dd425
Author: Martijn Coenen <maco@google.com>
Date:   Wed Aug 8 10:35:59 2012 -0700

    am 74dd4257: (-s ours) am 776b2480: (-s ours) am 91e82624: am 618ed5a4: (-s ours) Dump NFC controller firmware version in the logs. (DO NOT MERGE)

    * commit '74dd42571d343416a509c4bdd16f0b8425e2c367':

commit 5e70c00c591010f767ce94e3c663c233d190a3a7
Merge: b59ac97 c99a555
Author: Martijn Coenen <maco@google.com>
Date:   Wed Aug 8 10:35:58 2012 -0700

    am c99a5558: (-s ours) am 23e90e31: (-s ours) am 80bdaebc: am 80cd2d68: (-s ours) Fix race conditions in NdefPushServer. (DO NOT MERGE)

    * commit 'c99a55587cc44371a2d760685f70d7c498cd5eb1':

commit b59ac97085728aaed9dd8724788098c0e2ae106b
Merge: 1892448 3198163
Author: Martijn Coenen <maco@google.com>
Date:   Wed Aug 8 10:35:57 2012 -0700

    am 3198163e: (-s ours) am 9c732f87: (-s ours) am e1979663: am 11d1aed9: (-s ours) Don\'t route PPSE AIDs to the host by default. (DO NOT MERGE)

    * commit '3198163e642352af32fd2f5ffd6faf6b3368a0d1':

commit 1892448550bacca993698e603ceeb91562058373
Merge: 9987331 b483d81
Author: Martijn Coenen <maco@google.com>
Date:   Wed Aug 8 10:35:56 2012 -0700

    am b483d812: (-s ours) am d21bd643: (-s ours) am 80688ad9: am a0069c82: (-s ours) Follow-up NFC code drop. (DO NOT MERGE)

    * commit 'b483d812b3fbad88309d65a247d5da4bf7044a29':

commit 99873318edc02195dd2973c83ebbb9ea00458872
Merge: 3a629cb 12a0030
Author: Martijn Coenen <maco@google.com>
Date:   Wed Aug 8 10:35:55 2012 -0700

    am 12a00301: (-s ours) am f1578d8a: (-s ours) am 97273d23: am a3f98c28: (-s ours) NFC: Initial NCI DeviceHost and JNI implementation. (DO NOT MERGE)

    * commit '12a00301932c7efb29cb56bfbed80bc0a5352b4a':

commit 3a629cb0f9d46932b62a3f1a8032f1478b9a77bb
Merge: 5fd701f a26efd6
Author: Martijn Coenen <maco@google.com>
Date:   Wed Aug 8 10:35:54 2012 -0700

    am a26efd60: (-s ours) am e0b3efa6: (-s ours) am 9b5c9319: am 96c08a7d: (-s ours) Point jni class references to new dhimpl package. (DO NOT MERGE)

    * commit 'a26efd60c46700b34f1ac9270e564e5eb5356274':

commit 5fd701fac862bb84f427888f959b377569f436b8
Merge: ff7e2a3 5df7edd
Author: Martijn Coenen <maco@google.com>
Date:   Wed Aug 8 10:35:53 2012 -0700

    am 5df7edd2: (-s ours) am 58595557: (-s ours) am 56ba805c: am 25b0c5d2: (-s ours) Fix type of collision resolution record. (DO NOT MERGE)

    * commit '5df7edd2c6f95134323fa5331ee44a391887ca53':

commit ff7e2a327858d984b9590e4416088d7bdef99357
Merge: bb5795a b24b16f
Author: Martijn Coenen <maco@google.com>
Date:   Wed Aug 8 10:35:52 2012 -0700

    am b24b16f3: (-s ours) am 09975a6b: (-s ours) am 333bcb2e: am 721d0196: (-s ours) Implement connection handover LLCP service. (DO NOT MERGE)

    * commit 'b24b16f3052dcdfba07a67b88bea0c2395eb6e61':

commit bb5795af7ca166f710a7967704a1770807f19478
Merge: c5b217c ccd5b2f
Author: Martijn Coenen <maco@google.com>
Date:   Wed Aug 8 10:35:51 2012 -0700

    am ccd5b2f4: (-s ours) am 9f61df8f: (-s ours) am 39d331be: am 4b33b45e: (-s ours) Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)

    * commit 'ccd5b2f4d496d2358ddc76cf32f1cfe9baa59c6f':

commit c5b217c469fba9c06db746aa26411e396705ee39
Merge: ab61cd0 b95bc7c
Author: Martijn Coenen <maco@google.com>
Date:   Wed Aug 8 10:35:50 2012 -0700

    am b95bc7c4: (-s ours) am 27434b05: (-s ours) am 26388729: am 51a43593: (-s ours) Revert "Move NXP JNI and DeviceHost implementation into separate dir." (DO NOT MERGE)

    * commit 'b95bc7c488653b0b59ad6c57b393cd8d7ee6cb69':

commit ab61cd0037ae4cbfd6eca33343dca6616ce88c75
Merge: 7798241 2fa63c1
Author: Martijn Coenen <maco@google.com>
Date:   Wed Aug 8 10:35:49 2012 -0700

    am 2fa63c1c: (-s ours) am f2400e27: (-s ours) am fef640c7: am c2b3f02b: (-s ours) Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)

    * commit '2fa63c1c121a24c02e732802532e00626ec20fd8':

commit 779824124140817e173e9cf3011710a32567d464
Merge: 1f85781 bb33d23
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 8 10:35:47 2012 -0700

    am bb33d236: (-s ours) am 81c2ded3: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'bb33d236cd0b7311a58264df887dc1753dbf0633':

commit 1f857818746a5e4794f3ee053b868fe02a1c5d4a
Merge: b3b8a67 7dbc6b3
Author: Martijn Coenen <maco@google.com>
Date:   Wed Aug 8 10:35:46 2012 -0700

    am 7dbc6b34: am 2c458354: am 34075ee7: Dump NFC controller firmware version in the logs.

    * commit '7dbc6b34bc551346504f06445b90ae04112ac499':

commit b3b8a67a79c9b6a3afa14aa79b1c0b2377ffd61b
Merge: b9d57e0 567535b
Author: Martijn Coenen <maco@google.com>
Date:   Wed Aug 8 10:35:45 2012 -0700

    am 567535b8: am 52f1cafc: am 17c69675: Fix race conditions in NdefPushServer.

    * commit '567535b82e419d0da8e1f12ddc756c14fe407121':

commit b9d57e09369262720f33d689796bc5e42223bb58
Merge: ef56725 00a5ce3
Author: Martijn Coenen <maco@google.com>
Date:   Wed Aug 8 10:35:44 2012 -0700

    am 00a5ce33: am d022fe85: am e2dcb2a8: Don\'t route PPSE AIDs to the host by default.

    * commit '00a5ce33ed40c8ec7aac1d85e7e2a404cad28fc9':

commit ef5672509cb29738a988e7a8fee10b119b1c90d4
Merge: fc424df 330ad0b
Author: Ying Wang <wangying@google.com>
Date:   Wed Aug 8 10:35:43 2012 -0700

    am 330ad0bd: (-s ours) Import translations. DO NOT MERGE

    * commit '330ad0bde08e5b120acdec14edee72b0b6cde930':
      Import translations. DO NOT MERGE

commit fc424df1d21e9068b9f8b03b499045002ff36279
Merge: 86565c3 e6d121e
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 8 10:35:42 2012 -0700

    am e6d121e4: (-s ours) am cf2744f7: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'e6d121e4d7de425680ea02759acb5c78158f7fa9':

commit 86565c32ffbd9894b57b0b173cb59b8da30887be
Merge: b8520c2 da4ea6f
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 8 10:35:41 2012 -0700

    am da4ea6f9: Sync with jb-mr1-dev

    * commit 'da4ea6f9e6543b1fe36c4cd79df3a1ec438efe7b':

commit b8520c2f05655e3c40a4569eafc8ac601429d836
Merge: a7e5767 10436a8
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 8 10:35:40 2012 -0700

    am 10436a83: Reconcile with jb-mr1-release

    * commit '10436a83d89ca5aadc2fe113b3117f02cbd6e8c2':

commit a7e5767c590f70d5b6ab4156bdcb0443b464f948
Merge: abe0cdf bad5505
Author: Martijn Coenen <maco@google.com>
Date:   Wed Aug 8 10:35:39 2012 -0700

    am bad55058: am c82b31a7: Merge "NFC: Initial NCI DeviceHost and JNI implementation." into jb-mr1-dev

    * commit 'bad550582a5d1df4eded657c69ca5bcf80ae44fa':

commit abe0cdf5487cff60a1deb891927ead8b3548f9b5
Merge: f6e5b87 1d93a06
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 8 10:35:38 2012 -0700

    am 1d93a064: am 4ea2e525: am 29b858a5: Reconcile with jb-mr0-release

    * commit '1d93a06440a1336fa92af1924992933517a6871c':

commit f6e5b8739c78a8620c5b0b83ab920f319a067ca7
Merge: ae577de 9bad2bb
Author: Martijn Coenen <maco@google.com>
Date:   Wed Aug 8 10:35:37 2012 -0700

    am 9bad2bb0: am 7a1d2adf: am 238cce65: am 69369b77: am 43f22631: Fix type of collision resolution record.

    * commit '9bad2bb0bf2490c1821a62d0a63af2d7face6b07':

commit ae577de97629635623986cfcd5604b376087ba93
Merge: 0aabb65 480c1c3
Author: Martijn Coenen <maco@google.com>
Date:   Wed Aug 8 10:35:36 2012 -0700

    am 480c1c39: am 14a531a2: am 73eac104: am afa30410: am 327d0e7c: Implement connection handover LLCP service.

    * commit '480c1c39ed9a1e3106fdec588b651739f7231984':

commit 0aabb65b73082f0e3ed888bad28f80e4a4efb980
Merge: 484d6a3 e1182ce
Author: Martijn Coenen <maco@google.com>
Date:   Wed Aug 8 10:35:33 2012 -0700

    am e1182ce9: am 642ab20c: Point jni class references to new dhimpl package.

    * commit 'e1182ce9ba3de2a8b9610ae407f7033d356557ad':

commit 3c47e69e330d6d2890afae3b0b447954fbb97911
Author: Elliott Hughes <enh@google.com>
Date:   Tue Aug 7 18:13:08 2012 -0700

    Fix one last user of astl to use stlport instead...

    This wasn't directly referencing libastl, so I didn't find it first
    time round. A top level rebuild without external/astl caught it. I've
    since grepped and there are no other projects that pull in the include
    files without the shared library.

    Change-Id: I2dd06727098744076a7e115d05a8139029ff977a

commit 071265009b2a7e65e4d9f7b12c796748a0fde67a
Merge: 484d6a3 1d723b2
Author: The Android Automerger <android-build@android.com>
Date:   Wed Aug 8 06:47:54 2012 -0700

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

commit 8d6ea79dad7c25f592722faf47709e1b918d4c21
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 13:05:31 2012 -0700

    Allow different default MIU / window sizes.

    The new NCI stack can deal with larger MIU and
    rw sizes, which give us better p2p throughput.

    Change-Id: I6600f28ddafe142b64ead2df896823bb8d242fc5

commit 2d57efb70a92553623370786bfede151603d3305
Merge: bb3c38a 0e8be1f
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Aug 7 11:08:25 2012 -0700

    am 0e8be1f8: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '0e8be1f823d4a3f5c41c7104ac82142b3644546d':

commit 0e8be1f823d4a3f5c41c7104ac82142b3644546d
Merge: 295c9c2 1d723b2
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Aug 7 11:04:48 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I7518866977fae2451bbabd4d213f0a184df56b26

commit bb3c38aec1fef674ce2ec462e7ce463963985800
Merge: 74dd425 295c9c2
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 10:58:36 2012 -0700

    am 295c9c25: am 484d6a32: am bb65a8d8: Allow NfcB connects in NCI stack.

    * commit '295c9c2521807b09882c04069343c0ad37ec42ca':
      Allow NfcB connects in NCI stack.

commit 295c9c2521807b09882c04069343c0ad37ec42ca
Merge: 776b248 484d6a3
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 10:55:36 2012 -0700

    am 484d6a32: am bb65a8d8: Allow NfcB connects in NCI stack.

    * commit '484d6a32e4d35e3e2e408010e12a51dfe0224632':
      Allow NfcB connects in NCI stack.

commit 484d6a32e4d35e3e2e408010e12a51dfe0224632
Merge: 91e8262 bb65a8d
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 10:54:24 2012 -0700

    am bb65a8d8: Allow NfcB connects in NCI stack.

    * commit 'bb65a8d87ee523c92ca1b5f57efe139bab3859fe':
      Allow NfcB connects in NCI stack.

commit bb65a8d87ee523c92ca1b5f57efe139bab3859fe
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 10:49:21 2012 -0700

    Allow NfcB connects in NCI stack.

    PN544 did not support this - move the code checking for that
    into dh implementation.

    Change-Id: I4def57697bc81cf599421f1ffbfa85c0db72c458

commit 74dd42571d343416a509c4bdd16f0b8425e2c367
Merge: c99a555 776b248
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:10:32 2012 -0700

    am 776b2480: (-s ours) am 91e82624: am 618ed5a4: (-s ours) Dump NFC controller firmware version in the logs. (DO NOT MERGE)

    * commit '776b24809659122f681b4b6e4e959579817d02c6':
      Dump NFC controller firmware version in the logs. (DO NOT MERGE)

commit c99a55587cc44371a2d760685f70d7c498cd5eb1
Merge: 3198163 23e90e3
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:10:31 2012 -0700

    am 23e90e31: (-s ours) am 80bdaebc: am 80cd2d68: (-s ours) Fix race conditions in NdefPushServer. (DO NOT MERGE)

    * commit '23e90e31c86095c9f839d91d59a6279d49be3f3a':
      Fix race conditions in NdefPushServer. (DO NOT MERGE)

commit 3198163e642352af32fd2f5ffd6faf6b3368a0d1
Merge: b483d81 9c732f8
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:10:30 2012 -0700

    am 9c732f87: (-s ours) am e1979663: am 11d1aed9: (-s ours) Don\'t route PPSE AIDs to the host by default. (DO NOT MERGE)

    * commit '9c732f87b56431bb89c8442c47374e721f35dc67':
      Don't route PPSE AIDs to the host by default. (DO NOT MERGE)

commit b483d812b3fbad88309d65a247d5da4bf7044a29
Merge: 12a0030 d21bd64
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:10:29 2012 -0700

    am d21bd643: (-s ours) am 80688ad9: am a0069c82: (-s ours) Follow-up NFC code drop. (DO NOT MERGE)

    * commit 'd21bd643bbeee5d4bb587a14b473fc1914546625':
      Follow-up NFC code drop. (DO NOT MERGE)

commit 12a00301932c7efb29cb56bfbed80bc0a5352b4a
Merge: a26efd6 f1578d8
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:10:28 2012 -0700

    am f1578d8a: (-s ours) am 97273d23: am a3f98c28: (-s ours) NFC: Initial NCI DeviceHost and JNI implementation. (DO NOT MERGE)

    * commit 'f1578d8a641cb85dc31bd6782fa116c02347a182':
      NFC: Initial NCI DeviceHost and JNI implementation. (DO NOT MERGE)

commit a26efd60c46700b34f1ac9270e564e5eb5356274
Merge: 5df7edd e0b3efa
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:10:27 2012 -0700

    am e0b3efa6: (-s ours) am 9b5c9319: am 96c08a7d: (-s ours) Point jni class references to new dhimpl package. (DO NOT MERGE)

    * commit 'e0b3efa6998b667af07bdf272e402e2fd97a7f10':
      Point jni class references to new dhimpl package. (DO NOT MERGE)

commit 5df7edd2c6f95134323fa5331ee44a391887ca53
Merge: b24b16f 5859555
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:10:26 2012 -0700

    am 58595557: (-s ours) am 56ba805c: am 25b0c5d2: (-s ours) Fix type of collision resolution record. (DO NOT MERGE)

    * commit '5859555794ed4e2f741d574c8ac3dfc98d194669':
      Fix type of collision resolution record. (DO NOT MERGE)

commit b24b16f3052dcdfba07a67b88bea0c2395eb6e61
Merge: ccd5b2f 09975a6
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:10:25 2012 -0700

    am 09975a6b: (-s ours) am 333bcb2e: am 721d0196: (-s ours) Implement connection handover LLCP service. (DO NOT MERGE)

    * commit '09975a6b0907057a9e022c6287bb946f7ca089a4':
      Implement connection handover LLCP service. (DO NOT MERGE)

commit ccd5b2f4d496d2358ddc76cf32f1cfe9baa59c6f
Merge: b95bc7c 9f61df8
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:10:24 2012 -0700

    am 9f61df8f: (-s ours) am 39d331be: am 4b33b45e: (-s ours) Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)

    * commit '9f61df8fe808c90535d401efc94055f78d1c3849':
      Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)

commit b95bc7c488653b0b59ad6c57b393cd8d7ee6cb69
Merge: 2fa63c1 27434b0
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:10:23 2012 -0700

    am 27434b05: (-s ours) am 26388729: am 51a43593: (-s ours) Revert "Move NXP JNI and DeviceHost implementation into separate dir." (DO NOT MERGE)

    * commit '27434b05389e462352e0544e7c7a1033f2c140cb':
      Revert "Move NXP JNI and DeviceHost implementation into separate dir." (DO NOT MERGE)

commit 2fa63c1c121a24c02e732802532e00626ec20fd8
Merge: bb33d23 f2400e2
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:10:21 2012 -0700

    am f2400e27: (-s ours) am fef640c7: am c2b3f02b: (-s ours) Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)

    * commit 'f2400e273f6dee5d4579867629dd96d5c753ae98':
      Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)

commit 776b24809659122f681b4b6e4e959579817d02c6
Merge: 23e90e3 91e8262
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:07:19 2012 -0700

    am 91e82624: am 618ed5a4: (-s ours) Dump NFC controller firmware version in the logs. (DO NOT MERGE)

    * commit '91e826241003a5ac72f911b6c0bbc10075c39d84':
      Dump NFC controller firmware version in the logs. (DO NOT MERGE)

commit 23e90e31c86095c9f839d91d59a6279d49be3f3a
Merge: 9c732f8 80bdaeb
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:07:18 2012 -0700

    am 80bdaebc: am 80cd2d68: (-s ours) Fix race conditions in NdefPushServer. (DO NOT MERGE)

    * commit '80bdaebc1dd1ce5848ce967cd0f1d3fae2c541e8':
      Fix race conditions in NdefPushServer. (DO NOT MERGE)

commit 9c732f87b56431bb89c8442c47374e721f35dc67
Merge: d21bd64 e197966
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:07:17 2012 -0700

    am e1979663: am 11d1aed9: (-s ours) Don\'t route PPSE AIDs to the host by default. (DO NOT MERGE)

    * commit 'e197966328c7d030673a2da0185e9b1dfb88b718':
      Don't route PPSE AIDs to the host by default. (DO NOT MERGE)

commit d21bd643bbeee5d4bb587a14b473fc1914546625
Merge: f1578d8 80688ad
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:07:16 2012 -0700

    am 80688ad9: am a0069c82: (-s ours) Follow-up NFC code drop. (DO NOT MERGE)

    * commit '80688ad96a546f36fa17f9753aa57834e5348b0e':
      Follow-up NFC code drop. (DO NOT MERGE)

commit f1578d8a641cb85dc31bd6782fa116c02347a182
Merge: e0b3efa 97273d2
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:07:15 2012 -0700

    am 97273d23: am a3f98c28: (-s ours) NFC: Initial NCI DeviceHost and JNI implementation. (DO NOT MERGE)

    * commit '97273d2333f61af7e0d80cca473dc02e3eee09a2':
      NFC: Initial NCI DeviceHost and JNI implementation. (DO NOT MERGE)

commit e0b3efa6998b667af07bdf272e402e2fd97a7f10
Merge: 5859555 9b5c931
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:07:14 2012 -0700

    am 9b5c9319: am 96c08a7d: (-s ours) Point jni class references to new dhimpl package. (DO NOT MERGE)

    * commit '9b5c93193f7bd23835b24bed311ce6ec8b7ccaae':
      Point jni class references to new dhimpl package. (DO NOT MERGE)

commit 5859555794ed4e2f741d574c8ac3dfc98d194669
Merge: 09975a6 56ba805
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:07:13 2012 -0700

    am 56ba805c: am 25b0c5d2: (-s ours) Fix type of collision resolution record. (DO NOT MERGE)

    * commit '56ba805cac20b1040b4a08bc6114ffb7e1a6bad0':
      Fix type of collision resolution record. (DO NOT MERGE)

commit 09975a6b0907057a9e022c6287bb946f7ca089a4
Merge: 9f61df8 333bcb2
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:07:12 2012 -0700

    am 333bcb2e: am 721d0196: (-s ours) Implement connection handover LLCP service. (DO NOT MERGE)

    * commit '333bcb2e86e77c9fae37bbb17e86433c6866abb4':
      Implement connection handover LLCP service. (DO NOT MERGE)

commit 9f61df8fe808c90535d401efc94055f78d1c3849
Merge: 27434b0 39d331b
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:07:12 2012 -0700

    am 39d331be: am 4b33b45e: (-s ours) Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)

    * commit '39d331bee37f8a842cfb175c83b2029b72dc64af':
      Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)

commit 27434b05389e462352e0544e7c7a1033f2c140cb
Merge: f2400e2 2638872
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:07:11 2012 -0700

    am 26388729: am 51a43593: (-s ours) Revert "Move NXP JNI and DeviceHost implementation into separate dir." (DO NOT MERGE)

    * commit '2638872919765b241b5e934bf6ac144211fc446f':
      Revert "Move NXP JNI and DeviceHost implementation into separate dir." (DO NOT MERGE)

commit f2400e273f6dee5d4579867629dd96d5c753ae98
Merge: 81c2ded fef640c
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:07:10 2012 -0700

    am fef640c7: am c2b3f02b: (-s ours) Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)

    * commit 'fef640c7273f6ae6a4882e2bf61e278ec47198fc':
      Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)

commit 91e826241003a5ac72f911b6c0bbc10075c39d84
Merge: 80bdaeb 618ed5a
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:05:48 2012 -0700

    am 618ed5a4: (-s ours) Dump NFC controller firmware version in the logs. (DO NOT MERGE)

    * commit '618ed5a492c6474d3d5fd11d06febded71b0a7c2':
      Dump NFC controller firmware version in the logs. (DO NOT MERGE)

commit 80bdaebc1dd1ce5848ce967cd0f1d3fae2c541e8
Merge: e197966 80cd2d6
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:05:48 2012 -0700

    am 80cd2d68: (-s ours) Fix race conditions in NdefPushServer. (DO NOT MERGE)

    * commit '80cd2d684ffec51b1a05f9ab1bc7eacff311ecef':
      Fix race conditions in NdefPushServer. (DO NOT MERGE)

commit e197966328c7d030673a2da0185e9b1dfb88b718
Merge: 80688ad 11d1aed
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:05:48 2012 -0700

    am 11d1aed9: (-s ours) Don\'t route PPSE AIDs to the host by default. (DO NOT MERGE)

    * commit '11d1aed981ebedf675029326f2602c1b1bfaf62e':
      Don't route PPSE AIDs to the host by default. (DO NOT MERGE)

commit 80688ad96a546f36fa17f9753aa57834e5348b0e
Merge: 97273d2 a0069c8
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:05:48 2012 -0700

    am a0069c82: (-s ours) Follow-up NFC code drop. (DO NOT MERGE)

    * commit 'a0069c828b8e09089ce38fe80c058268a44fc932':
      Follow-up NFC code drop. (DO NOT MERGE)

commit 97273d2333f61af7e0d80cca473dc02e3eee09a2
Merge: 9b5c931 a3f98c2
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:05:48 2012 -0700

    am a3f98c28: (-s ours) NFC: Initial NCI DeviceHost and JNI implementation. (DO NOT MERGE)

    * commit 'a3f98c286444a9fb009cf6c6753ae67bdf51ac6b':
      NFC: Initial NCI DeviceHost and JNI implementation. (DO NOT MERGE)

commit 9b5c93193f7bd23835b24bed311ce6ec8b7ccaae
Merge: 56ba805 96c08a7
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:05:48 2012 -0700

    am 96c08a7d: (-s ours) Point jni class references to new dhimpl package. (DO NOT MERGE)

    * commit '96c08a7d49a8dcd33a5acac1c7c73fe3711bd9bd':
      Point jni class references to new dhimpl package. (DO NOT MERGE)

commit 56ba805cac20b1040b4a08bc6114ffb7e1a6bad0
Merge: 333bcb2 25b0c5d
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:05:48 2012 -0700

    am 25b0c5d2: (-s ours) Fix type of collision resolution record. (DO NOT MERGE)

    * commit '25b0c5d26d58d7d0af200b315a840881001b544d':
      Fix type of collision resolution record. (DO NOT MERGE)

commit 333bcb2e86e77c9fae37bbb17e86433c6866abb4
Merge: 39d331b 721d019
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:05:47 2012 -0700

    am 721d0196: (-s ours) Implement connection handover LLCP service. (DO NOT MERGE)

    * commit '721d01960285314178c9026f4cbca449a5f385a6':
      Implement connection handover LLCP service. (DO NOT MERGE)

commit 39d331bee37f8a842cfb175c83b2029b72dc64af
Merge: 2638872 4b33b45
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:05:47 2012 -0700

    am 4b33b45e: (-s ours) Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)

    * commit '4b33b45ed7880968f9836213e2395dbd55e17b31':
      Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)

commit 2638872919765b241b5e934bf6ac144211fc446f
Merge: fef640c 51a4359
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:05:47 2012 -0700

    am 51a43593: (-s ours) Revert "Move NXP JNI and DeviceHost implementation into separate dir." (DO NOT MERGE)

    * commit '51a43593261ebf190f736ecbb3939b69479a21dc':
      Revert "Move NXP JNI and DeviceHost implementation into separate dir." (DO NOT MERGE)

commit fef640c7273f6ae6a4882e2bf61e278ec47198fc
Merge: 34075ee c2b3f02
Author: Martijn Coenen <maco@google.com>
Date:   Tue Aug 7 09:05:47 2012 -0700

    am c2b3f02b: (-s ours) Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)

    * commit 'c2b3f02b1217c761d5247c3cda9444f0418b51cb':
      Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)

commit 1d723b279583dd5951beca923e818f9df2049544
Merge: 34075ee 9714e9b
Author: The Android Automerger <android-build@android.com>
Date:   Tue Aug 7 06:34:59 2012 -0700

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

commit bb33d236cd0b7311a58264df887dc1753dbf0633
Merge: 7dbc6b3 81c2ded
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Aug 6 13:28:56 2012 -0700

    am 81c2ded3: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '81c2ded3e48186140f00bb2404d92205b0302aed':

commit 81c2ded3e48186140f00bb2404d92205b0302aed
Merge: 2c45835 9714e9b
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Aug 6 13:25:40 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I29ad3918b9dcd481c3e01624bb3760257e33dbf6

commit 7dbc6b34bc551346504f06445b90ae04112ac499
Merge: 567535b 2c45835
Author: Martijn Coenen <maco@google.com>
Date:   Mon Aug 6 11:55:24 2012 -0700

    am 2c458354: am 34075ee7: Dump NFC controller firmware version in the logs.

    * commit '2c458354b08964c18047f21a381592ed0e4c146d':
      Dump NFC controller firmware version in the logs.

commit 2c458354b08964c18047f21a381592ed0e4c146d
Merge: 52f1caf 34075ee
Author: Martijn Coenen <maco@google.com>
Date:   Mon Aug 6 11:53:43 2012 -0700

    am 34075ee7: Dump NFC controller firmware version in the logs.

    * commit '34075ee7fdded0b5ace697536efe54442d49609c':
      Dump NFC controller firmware version in the logs.

commit 34075ee7fdded0b5ace697536efe54442d49609c
Author: Martijn Coenen <maco@google.com>
Date:   Mon Aug 6 11:37:35 2012 -0700

    Dump NFC controller firmware version in the logs.

    Change-Id: I0ff7c460b53f56d7b98e1e27838cfd4243a2b0a0

commit 618ed5a492c6474d3d5fd11d06febded71b0a7c2
Author: Martijn Coenen <maco@google.com>
Date:   Mon Aug 6 11:37:35 2012 -0700

    Dump NFC controller firmware version in the logs. (DO NOT MERGE)

    Change-Id: I0ff7c460b53f56d7b98e1e27838cfd4243a2b0a0

commit 9714e9b369d12d92950db881846631c3e0ffe76e
Merge: 17c6967 41fe887
Author: The Android Automerger <android-build@android.com>
Date:   Mon Aug 6 06:29:10 2012 -0700

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

commit 567535b82e419d0da8e1f12ddc756c14fe407121
Merge: 00a5ce3 52f1caf
Author: Martijn Coenen <maco@google.com>
Date:   Fri Aug 3 12:03:40 2012 -0700

    am 52f1cafc: am 17c69675: Fix race conditions in NdefPushServer.

    * commit '52f1cafcf131abc64d08bfd271d89c7567488c22':
      Fix race conditions in NdefPushServer.

commit 52f1cafcf131abc64d08bfd271d89c7567488c22
Merge: d022fe8 17c6967
Author: Martijn Coenen <maco@google.com>
Date:   Fri Aug 3 12:00:52 2012 -0700

    am 17c69675: Fix race conditions in NdefPushServer.

    * commit '17c6967521cc31828dcf22bd7d8628dd126474f8':
      Fix race conditions in NdefPushServer.

commit 17c6967521cc31828dcf22bd7d8628dd126474f8
Author: Martijn Coenen <maco@google.com>
Date:   Thu Aug 2 10:26:09 2012 -0700

    Fix race conditions in NdefPushServer.

    Exposed by the new stack; need to take locks around
    mRunning and mLlcpServerSocket.

    Bug: 6922853
    Change-Id: Ic8e3b90d1a1c9d77b27308e3f18bf8871843206f

commit 00a5ce33ed40c8ec7aac1d85e7e2a404cad28fc9
Merge: 330ad0b d022fe8
Author: Martijn Coenen <maco@google.com>
Date:   Thu Aug 2 15:08:54 2012 -0700

    am d022fe85: am e2dcb2a8: Don\'t route PPSE AIDs to the host by default.

    * commit 'd022fe855a14e8c58fcbb7712f7f039db50141fd':
      Don't route PPSE AIDs to the host by default.

commit 7c2d3ef46c138a31f77cb97af130f12569881a8b
Author: Marco Brohet <therbom@gmail.com>
Date:   Thu Aug 2 20:57:36 2012 +0200

    Nfc: Dutch translations

    Change-Id: Ief1e0ba295a3d7cc443b6fab8fc814bda4f33daf

commit 80cd2d684ffec51b1a05f9ab1bc7eacff311ecef
Author: Martijn Coenen <maco@google.com>
Date:   Thu Aug 2 10:26:09 2012 -0700

    Fix race conditions in NdefPushServer. (DO NOT MERGE)

    Exposed by the new stack; need to take locks around
    mRunning and mLlcpServerSocket.

    Bug: 6922853
    Change-Id: Ic8e3b90d1a1c9d77b27308e3f18bf8871843206f

commit d022fe855a14e8c58fcbb7712f7f039db50141fd
Merge: cf2744f e2dcb2a
Author: Martijn Coenen <maco@google.com>
Date:   Thu Aug 2 09:38:05 2012 -0700

    am e2dcb2a8: Don\'t route PPSE AIDs to the host by default.

    * commit 'e2dcb2a8904291a5ec521d86487ac84811c537ed':
      Don't route PPSE AIDs to the host by default.

commit e2dcb2a8904291a5ec521d86487ac84811c537ed
Author: Martijn Coenen <maco@google.com>
Date:   Thu Aug 2 09:28:34 2012 -0700

    Don't route PPSE AIDs to the host by default.

    In our current model these AIDs should be handled by
    the EE.

    Because this routing also activates Nfc-B listen mode,
    it causes some Beam inter-op issues with PN544-based devices.

    Change-Id: I865bbf7cdd48a781410ad3742426fa9b05751c70

commit 11d1aed981ebedf675029326f2602c1b1bfaf62e
Author: Martijn Coenen <maco@google.com>
Date:   Thu Aug 2 09:28:34 2012 -0700

    Don't route PPSE AIDs to the host by default. (DO NOT MERGE)

    In our current model these AIDs should be handled by
    the EE.

    Because this routing also activates Nfc-B listen mode,
    it causes some Beam inter-op issues with PN544-based devices.

    Change-Id: I865bbf7cdd48a781410ad3742426fa9b05751c70

commit a0069c828b8e09089ce38fe80c058268a44fc932
Author: Martijn Coenen <maco@google.com>
Date:   Mon Jul 30 16:09:59 2012 -0700

    Follow-up NFC code drop. (DO NOT MERGE)

    From partner, uploaded 07/26/2012; modified to fit
    in new dhimpl/jni split.

    Change-Id: I3a8c04ab9427adc1295b7b46ec1308f98a2c2c5e

commit a3f98c286444a9fb009cf6c6753ae67bdf51ac6b
Author: Martijn Coenen <maco@google.com>
Date:   Wed Jul 25 15:07:43 2012 -0700

    NFC: Initial NCI DeviceHost and JNI implementation. (DO NOT MERGE)

    From partner drop at 07/20. Modified to fit into our new
    JNI/DH split.

    New build config that builds two targets,
    Nfc and NfcNci, each with their own dependencies. Product config files
    have to specify either Nfc or NfcNci in their packages config.
    Change-Id: I348a3aad7167195ca03baf9636408ab8e4c55fce

commit 96c08a7d49a8dcd33a5acac1c7c73fe3711bd9bd
Author: Martijn Coenen <maco@google.com>
Date:   Wed Jul 25 13:30:11 2012 -0700

    Point jni class references to new dhimpl package. (DO NOT MERGE)

    The DeviceHost classed moved to a new package,
    updated the JNI references accordingly.

    Change-Id: I11d30b241f80e2efba4570a921346ea3689b4ec5

commit 25b0c5d26d58d7d0af200b315a840881001b544d
Author: Martijn Coenen <maco@google.com>
Date:   Mon Jul 23 09:44:37 2012 -0700

    Fix type of collision resolution record. (DO NOT MERGE)

    Bug: 6759842
    Change-Id: I6d1e24472702007616c0be71aacda9e591a23620

commit 721d01960285314178c9026f4cbca449a5f385a6
Author: Martijn Coenen <maco@google.com>
Date:   Wed Jul 11 12:24:11 2012 -0700

    Implement connection handover LLCP service. (DO NOT MERGE)

    The Connection Handover specification dictates that we should
    exchange Hr/Hs records over a dedicated LLCP service. This adds
    the service, and starts using it by default. It will fall back
    to the SNEP GET method to remain compatible with Android 4.1
    devices. SNEP GET on these devices will return "Not Implemented",
    also per the SNEP spec.

    Also fixed a bug in endianness of the OOB record.

    Bug: 6759842
    Change-Id: Ifd360f556bf0e1757eb8bbaadf11efa094aefcf6

commit 4b33b45ed7880968f9836213e2395dbd55e17b31
Author: Martijn Coenen <maco@google.com>
Date:   Wed Jul 25 08:56:11 2012 -0700

    Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)

    Preparation for the new NCI stack. The idea is to
    build either the NXP or the NCI stack, triggered
    by a makefile switch. To that end, move the
    DeviceHost and JNI implementations in their own
    directory, so we can build them only if needed.

    Change-Id: I8579ec30ceb1908e4cd180cfbd10224aa4bddb8d

commit 51a43593261ebf190f736ecbb3939b69479a21dc
Author: Martijn Coenen <maco@google.com>
Date:   Tue Jul 24 20:54:28 2012 -0700

    Revert "Move NXP JNI and DeviceHost implementation into separate dir." (DO NOT MERGE)

    This reverts commit 26f6049196acaa9768ba6bdef343216ea878a4c1.

    Change-Id: I7ed3a1ba24bbbdb3336547c20f47c344d70b2d30

commit c2b3f02b1217c761d5247c3cda9444f0418b51cb
Author: Martijn Coenen <maco@google.com>
Date:   Fri Jul 20 15:09:37 2012 -0400

    Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)

    Preparation for the new NCI stack. The idea is to
    build either the NXP or the NCI stack, triggered
    by a makefile switch. To that end, move the
    DeviceHost and JNI implementations in their own
    directory, so we can build them only if needed.

    Change-Id: Ibb6aeb11f0bb887e153fd457860b1ad0e39e7933

commit 330ad0bde08e5b120acdec14edee72b0b6cde930
Author: Ying Wang <wangying@google.com>
Date:   Wed Aug 1 11:31:08 2012 -0700

    Import translations. DO NOT MERGE

    Change-Id: I340ff3b4e7d9822f677898ce942aa09b15ce0de3
    Auto-generated-cl: translation import

commit e6d121e4d7de425680ea02759acb5c78158f7fa9
Merge: da4ea6f cf2744f
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Jul 31 15:06:03 2012 -0700

    am cf2744f7: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'cf2744f769da8ee6db7f057312c2ed43c04349c9':

commit cf2744f769da8ee6db7f057312c2ed43c04349c9
Merge: da4ea6f 41fe887
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Jul 31 15:03:58 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Iec25cfdaf78589673cf99267d0d04ed9001fd218

commit da4ea6f9e6543b1fe36c4cd79df3a1ec438efe7b
Merge: 10436a8 cca2c7d
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Jul 31 07:52:32 2012 -0700

    Sync with jb-mr1-dev

    Change-Id: I93695a7ace99fb3e7090192335425223330cae24

commit 41fe887ecef0686bb0b999402b295694dfcac7ba
Merge: cca2c7d ca34d15
Author: The Android Automerger <android-build@android.com>
Date:   Tue Jul 31 07:35:30 2012 -0700

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

commit cca2c7daee1b4073f2e1ce05676f44bde2f7094b
Merge: c82b31a 343d006
Author: Martijn Coenen <maco@google.com>
Date:   Mon Jul 30 18:58:24 2012 -0700

    Merge "Follow-up NFC code drop." into jb-mr1-dev

commit 343d00630cd9d5a80e003ab15a527acda45d2ae0
Author: Martijn Coenen <maco@google.com>
Date:   Mon Jul 30 16:09:59 2012 -0700

    Follow-up NFC code drop.

    From partner, uploaded 07/26/2012; modified to fit
    in new dhimpl/jni split.

    Change-Id: I3a8c04ab9427adc1295b7b46ec1308f98a2c2c5e

commit 10436a83d89ca5aadc2fe113b3117f02cbd6e8c2
Merge: bad5505 ca34d15
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Jul 30 15:05:09 2012 -0700

    Reconcile with jb-mr1-release

    Change-Id: Ia96c1d0b6d5d91564d5ad9a91c36782a6c7b342d

commit ca34d1501d85fc7a67a6c97f5d60e0458e1cd7d6
Merge: 19dd185 bad5505
Author: Martijn Coenen <maco@google.com>
Date:   Fri Jul 27 18:41:53 2012 -0700

    am bad55058: am c82b31a7: Merge "NFC: Initial NCI DeviceHost and JNI implementation." into jb-mr1-dev

    * commit 'bad550582a5d1df4eded657c69ca5bcf80ae44fa':
      NFC: Initial NCI DeviceHost and JNI implementation.

commit bad550582a5d1df4eded657c69ca5bcf80ae44fa
Merge: 1d93a06 c82b31a
Author: Martijn Coenen <maco@google.com>
Date:   Fri Jul 27 18:40:00 2012 -0700

    am c82b31a7: Merge "NFC: Initial NCI DeviceHost and JNI implementation." into jb-mr1-dev

    * commit 'c82b31a799b623cb1e565ad4be0c07fde18e8449':
      NFC: Initial NCI DeviceHost and JNI implementation.

commit c82b31a799b623cb1e565ad4be0c07fde18e8449
Merge: 4ea2e52 c981340
Author: Martijn Coenen <maco@google.com>
Date:   Fri Jul 27 18:37:47 2012 -0700

    Merge "NFC: Initial NCI DeviceHost and JNI implementation." into jb-mr1-dev

commit c981340b7157e1b1873ca741f37b1ff19edae0b8
Author: Martijn Coenen <maco@google.com>
Date:   Wed Jul 25 15:07:43 2012 -0700

    NFC: Initial NCI DeviceHost and JNI implementation.

    From partner drop at 07/20. Modified to fit into our new
    JNI/DH split.

    New build config that builds two targets,
    Nfc and NfcNci, each with their own dependencies. Product config files
    have to specify either Nfc or NfcNci in their packages config.
    Change-Id: I348a3aad7167195ca03baf9636408ab8e4c55fce

commit 19dd1855783d8275adb35966beed535e0ed65c1e
Merge: 3675559 1d93a06
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Jul 27 16:23:50 2012 -0700

    am 1d93a064: am 4ea2e525: am 29b858a5: Reconcile with jb-mr0-release

    * commit '1d93a06440a1336fa92af1924992933517a6871c':

commit 1d93a06440a1336fa92af1924992933517a6871c
Merge: 9bad2bb 4ea2e52
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Jul 27 15:51:31 2012 -0700

    am 4ea2e525: am 29b858a5: Reconcile with jb-mr0-release

    * commit '4ea2e525f5d21383b6f466831120ec608d9040aa':

commit 4ea2e525f5d21383b6f466831120ec608d9040aa
Merge: 7a1d2ad 29b858a
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Jul 27 15:45:32 2012 -0700

    am 29b858a5: Reconcile with jb-mr0-release

    * commit '29b858a5d60a0ccd14be56ab0739b0ac45ec4656':

commit 29b858a5d60a0ccd14be56ab0739b0ac45ec4656
Merge: 69369b7 156c71e
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Jul 27 14:53:05 2012 -0700

    Reconcile with jb-mr0-release

    Change-Id: I9368f5edddf23587c72fc9658f0bd263ab6e75f0

commit 156c71e4b217d7da285ccc82e56d92f2b1874db5
Merge: 43f2263 fd4b41a
Author: The Android Automerger <android-build@android.com>
Date:   Thu Jul 26 17:49:54 2012 -0700

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

commit 36755598005cbbbfe4f7e9eff1e9ac8fe1bc2e69
Merge: a0c87cd 9bad2bb
Author: Martijn Coenen <maco@google.com>
Date:   Thu Jul 26 08:15:10 2012 -0700

    am 9bad2bb0: am 7a1d2adf: am 238cce65: am 69369b77: am 43f22631: Fix type of collision resolution record.

    * commit '9bad2bb0bf2490c1821a62d0a63af2d7face6b07':

commit a0c87cdd710304068d3086cef3626baaa8a7e041
Merge: 13758cd 480c1c3
Author: Martijn Coenen <maco@google.com>
Date:   Thu Jul 26 08:15:09 2012 -0700

    am 480c1c39: am 14a531a2: am 73eac104: am afa30410: am 327d0e7c: Implement connection handover LLCP service.

    * commit '480c1c39ed9a1e3106fdec588b651739f7231984':

commit 13758cd76e90791b02f0574758ea57fb14567188
Merge: 7a1d2ad e1182ce
Author: Martijn Coenen <maco@google.com>
Date:   Thu Jul 26 08:15:08 2012 -0700

    am e1182ce9: am 642ab20c: Point jni class references to new dhimpl package.

    * commit 'e1182ce9ba3de2a8b9610ae407f7033d356557ad':

commit 9bad2bb0bf2490c1821a62d0a63af2d7face6b07
Merge: 480c1c3 7a1d2ad
Author: Martijn Coenen <maco@google.com>
Date:   Thu Jul 26 08:08:43 2012 -0700

    am 7a1d2adf: am 238cce65: am 69369b77: am 43f22631: Fix type of collision resolution record.

    * commit '7a1d2adf875d414625853b3a5360663e420a3769':

commit 480c1c39ed9a1e3106fdec588b651739f7231984
Merge: e1182ce 14a531a
Author: Martijn Coenen <maco@google.com>
Date:   Thu Jul 26 08:08:42 2012 -0700

    am 14a531a2: am 73eac104: am afa30410: am 327d0e7c: Implement connection handover LLCP service.

    * commit '14a531a2bf46a852e163995ff1a4a3f20fd7dbce':

commit e1182ce9ba3de2a8b9610ae407f7033d356557ad
Merge: 238cce6 642ab20
Author: Martijn Coenen <maco@google.com>
Date:   Thu Jul 26 08:08:41 2012 -0700

    am 642ab20c: Point jni class references to new dhimpl package.

    * commit '642ab20c81425ba93e206d2a30602cd67ae8bd38':
      Point jni class references to new dhimpl package.

Change-Id: I73a517b6b71a4e290ea67631d81b6da7c0bec8e1
NativeNfcManager: fix build

Change-Id: I834c9882641b540f04d528b9995ba9ff9806fb06
Update translatable.

Change-Id: I221ba5fabb7642d16bec081b184c14f82b596976