Martijn Coenen e7a81e7a87 am 47936bb8: am 7d91cc97: Merge "NFC card emulation API docs." into klp-dev ...

* commit '47936bb8f5192496b8007009f8732a9d7194b2ac':
  NFC card emulation API docs.

2013-10-14 19:00:44 -07:00

..

java

am 47936bb8: am 7d91cc97: Merge "NFC card emulation API docs." into klp-dev

2013-10-14 19:00:44 -07:00

jni

am f730b759: am d6c2ccb2: Merge "core: fix arithmetic on a pointer to void"

2013-10-14 13:17:20 -07:00

res

am 87408ffd: am f64247e4: Merge "Fix change to re-add carrier roaming details." into klp-dev

2013-10-14 19:00:32 -07:00

tests

…