platform_packages_apps_Nfc, branch jb-mr0-release Unnamed repository; edit this file 'description' to name the repository. merge in jb-mr0-release history after reset to jb-dev 2012-07-27T00:49:54+00:00 The Android Automerger android-build@android.com 2012-07-27T00:49:54+00:00 156c71e4b217d7da285ccc82e56d92f2b1874db5 






Fix type of collision resolution record.
2012-07-25T16:09:41+00:00

Martijn Coenen
maco@google.com

2012-07-23T16:44:37+00:00

43f226312d34edc17a6319f7d61a06d20e1850e7

Bug: 6759842
Change-Id: I6d1e24472702007616c0be71aacda9e591a23620





Bug: 6759842
Change-Id: I6d1e24472702007616c0be71aacda9e591a23620







Implement connection handover LLCP service.
2012-07-25T16:09:04+00:00

Martijn Coenen
maco@google.com

2012-07-11T19:24:11+00:00

327d0e7c5a454b704bd37bae40cf20383d00cc63

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





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







merge in jb-release history after reset to jb-dev
2012-06-19T14:05:04+00:00

The Android Automerger
android-build@android.com

2012-06-19T14:05:04+00:00

fd4b41a42a5b21acb11d4a78f9b0266841f9fd2c












Import translations. DO NOT MERGE
2012-06-18T18:04:38+00:00

Ying Wang
wangying@google.com

2012-06-18T18:04:38+00:00

e926ef2bdf7a2e77bac3582b2e5b7413d1e080c4

Change-Id: Ifa9dce33076eb0323f117e142eb413aa24593840





Change-Id: Ifa9dce33076eb0323f117e142eb413aa24593840







merge in jb-release history after reset to jb-dev
2012-06-14T14:04:06+00:00

The Android Automerger
android-build@android.com

2012-06-14T14:04:06+00:00

f45a17f26b034e4fbde71166678cfd7c6f871723












Import translations. DO NOT MERGE
2012-06-13T17:39:44+00:00

Eric Fischer
enf@google.com

2012-06-13T17:39:44+00:00

b725b483bf3e7b52abbd95e3f34c3c5c6013ef08

Change-Id: Id035f32a1f2559472b26f4a12e497a07f1522861





Change-Id: Id035f32a1f2559472b26f4a12e497a07f1522861







merge in jb-release history after reset to jb-dev
2012-06-11T14:04:05+00:00

The Android Automerger
android-build@android.com

2012-06-11T14:04:05+00:00

77be9c28fd3ac5bb2b7e0b2523dc352e7857821a












Import translations. DO NOT MERGE
2012-06-08T23:28:15+00:00

Eric Fischer
enf@google.com

2012-06-08T23:28:15+00:00

bce32b5e66caf46cf14cd57a726ab5830109b88f

Change-Id: Ib7edfa85b8363b0e0ec2258a297073a0f5a0a603





Change-Id: Ib7edfa85b8363b0e0ec2258a297073a0f5a0a603







merge in jb-release history after reset to jb-dev
2012-06-08T15:21:55+00:00

The Android Automerger
android-build@android.com

2012-06-08T15:21:55+00:00

4014eaa306a4d4b80a0a213655b93db3ce0edddd