Martijn Coenen fde45f5864 Merge "Support for setting the NfcA transceive timeout (API)."

2011-06-13 12:19:01 -07:00

..

java

Merge "Support for setting the NfcA transceive timeout (API)."

2011-06-13 12:19:01 -07:00

jni

Merge "Add ParcelSurfaceTexture Java class to enable ISurfaceTexture sharing via Binder."

2011-06-10 10:05:04 -07:00

res

Fix LockScreen regression.

2011-06-10 23:18:22 -07:00

tests

Merge "Update Configuration for renaming and fixes"

2011-06-13 11:43:12 -07:00