Martijn Coenen 2e9f65f978 Merge "Make NfcAdapter states public and fix build."

2013-01-09 12:28:44 -08:00

..

java

Merge "Make NfcAdapter states public and fix build."

2013-01-09 12:28:44 -08:00

jni

Add visual profiling feature

2013-01-04 19:21:54 -08:00

res

Import translations. DO NOT MERGE

2013-01-07 08:59:47 -08:00

tests

am 498eaf58: am bc7d5a55: am 537fb0af: Merge "Use most specific attributes for distinguished name display"

2013-01-04 17:50:52 -08:00