Nick Pelly a4f26c3d03 am 4d3ac03a: am e4dd154c: Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerbread ...

* commit '4d3ac03ade6184504ad3881def5e86133ae5f2f6':
  hange the default IsoDep timeout to 300ms (docs update).

2011-01-21 15:03:19 -08:00

..

config

…

java

am 4d3ac03a: am e4dd154c: Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerbread

2011-01-21 15:03:19 -08:00

jni

Add support for drawBitmapMesh().

2011-01-20 19:09:30 -08:00

res

Merge "Add and enforce the permission for encrypting/decrypting." into honeycomb

2011-01-21 11:59:15 -08:00

tests

am 588b1e45: Merge "Change the default ssid from GoogleGuest to the opennet for the power test." into honeycomb

2011-01-21 14:28:52 -08:00