Martijn Coenen 0754cb7586 am 1f8d7f61: am 370b593c: Merge "Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE." into klp-dev ...

* commit '1f8d7f61c07faa7ad566fe2329dcf7923f6221d0':
  Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE.

2013-09-16 10:37:45 -07:00

..

java

am 1f8d7f61: am 370b593c: Merge "Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE." into klp-dev

2013-09-16 10:37:45 -07:00

jni

am f3b4cf7d: am 28eeb420: Merge "Implement #10749688: Improve low memory reporting" into klp-dev

2013-09-13 17:30:31 -07:00

res

Merge "Add comment header for API 20 in public.xml"

2013-09-16 17:19:28 +00:00

tests

am 6c2ad7ac: am b32a8042: Merge "Use setAirplaneMode() API for Connectivity Manager tests" into klp-dev

2013-09-11 17:31:04 -07:00