Reconcile with jb-mr2-release - do not merge

Change-Id: Iad669d009c1e7989808da4cd71bbbe195b19927b
am 40bc77cf: Import translations. DO NOT MERGE

* commit '40bc77cfbeef1289f2f704d1cd1b5e1f7de1aec5':
  Import translations. DO NOT MERGE
Reconcile with jb-mr2-release - do not merge

Change-Id: I4ef37e87f36b47c31fdc889ccd5752646cc2eff1
am cbe27470: Update to new IPC API for getting data to share.

* commit 'cbe27470ef7e67324b9e8cbc32c25088d82e2a86':
  Update to new IPC API for getting data to share.
am 2b4fe5f5: Merge "Update JNI to work with latest stack drop." into jb-mr2-dev

* commit '2b4fe5f5fe3da819d21b2c0c3df09a370854c47b':
  Update JNI to work with latest stack drop.
am ae3c5a4b: Merge "Re-enable dynamic UICC idle timeout switching." into jb-mr2-dev

* commit 'ae3c5a4bca67c92c8d22a7c840e460fa7a17a7da':
  Re-enable dynamic UICC idle timeout switching.
Reconcile with jb-mr2-release - do not merge

Change-Id: Ief90255a2247c892b899f67a1553bbba4c53e32b
am 57a44d07: Deal with pre-MR2 PN544 NXP stack LLCP bugs.

* commit '57a44d07a3de327e8cdbbcd622118aa517313dbe':
  Deal with pre-MR2 PN544 NXP stack LLCP bugs.
Reconcile with jb-mr2-release - do not merge

Change-Id: I040c7edc5385cb6b35ea8dbf7edaba5eabc5625a
am e9a5b789: Fix race condition between NFC disabling and field events.

* commit 'e9a5b789db1a0a437073d20820be6266920cc7e8':
  Fix race condition between NFC disabling and field events.
am cf4ef456: Fixing NFC bug when confirm screen isn\'t required.

* commit 'cf4ef456bbf2c10f674b291ef7960af8b6bf6efa':
  Fixing NFC bug when confirm screen isn't required.
Reconcile with jb-mr2-release - do not merge

Change-Id: I62f6d0bf2b54fa2f016b1ac94a5625687cbf366b
am f36089a2: Fix Android Beam animation.

* commit 'f36089a293850babe57d2dfd48a22e8d1daf0fc0':
  Fix Android Beam animation.
am 6afaf97c: Merge "Improve Kovio reading reliability." into jb-mr2-dev

* commit '6afaf97c8449f18cb0e219c558b41849ba0b529c':
  Improve Kovio reading reliability.
am f1ca42a0: Merge "Properly reset field / listen mode flags in SE object." into jb-mr2-dev

* commit 'f1ca42a07636d17e7eae14bb994e7208d4d80f9a':
  Properly reset field / listen mode flags in SE object.
am 595ab7e9: Fix Beam animation deadlock.

* commit '595ab7e9788f61125fa14d1ff2768f995ac7b7e7':
  Fix Beam animation deadlock.
am 027f41e5: Merge "Add liblog" into jb-mr2-dev

* commit '027f41e53396c19c9b7572c49b7663c2e268c9af':
  Add liblog
Reconcile with jb-mr2-release - do not merge

Change-Id: Ia84a8cfac0bed493269614498a5896a3f080bef7
am 18cbef12: Restore discovery notification callback when (de)selecting SE.

* commit '18cbef124c779d889b538f29dfa5880951a2c59c':
  Restore discovery notification callback when (de)selecting SE.
am ca588abf: Merge "Remain compatible with 4.1 handover-over-SNEP devices." into jb-mr2-dev

* commit 'ca588abf7222b01cf8b379abf4f2c5fc60626df6':
  Remain compatible with 4.1 handover-over-SNEP devices.