Nick Pelly e14674d515 Merge "NfcAdapter: Remove dead AIDL methods."

2011-06-10 13:55:36 -07:00

..

java

Merge "NfcAdapter: Remove dead AIDL methods."

2011-06-10 13:55:36 -07:00

jni

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

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

res

Merge "resolved conflicts for merge of f51ded0f to master"

2011-06-10 12:47:12 -07:00

tests

Merge "Add Configuration.getLayoutDirectionFromLocale()"

2011-06-09 16:08:00 -07:00