Andres Morales b4589115ad am d6a2ab93: Merge "Remove dead NFC unlock code from fw/base" into lmp-dev ...

* commit 'd6a2ab930972d5578957ca919abd38fca074deec':
  Remove dead NFC unlock code from fw/base

2014-10-07 19:58:36 +00:00

..

java

am d6a2ab93: Merge "Remove dead NFC unlock code from fw/base" into lmp-dev

2014-10-07 19:58:36 +00:00

jni

Fix incorrect JNI_ABORT

2014-10-06 12:44:09 -07:00

res

Merge commit '69555fc2' into fix-merge-conflict3

2014-10-06 21:57:42 -07:00

tests

Fix issue #17752399: Multiple apps broken by GET_TASKS permission change

2014-10-03 16:26:04 -07:00