Dan Egnor 43b237bd95 am c78f9a0e: am 3c1363be: am 2f0dc6d9: Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo ...

Merge commit 'c78f9a0e1ba931988144a52c54bc05a7e1521f67'

* commit 'c78f9a0e1ba931988144a52c54bc05a7e1521f67':
  COMMENT ONLY change to add some warnings about ParcelFileDescriptor

2010-07-20 16:54:57 -07:00

..

config

…

java

am c78f9a0e: am 3c1363be: am 2f0dc6d9: Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo

2010-07-20 16:54:57 -07:00

jni

Merge "Add preliminary support for text rendering."

2010-07-20 16:43:31 -07:00

res

Add resource configuration flag to indicate whether USB host support exists.

2010-07-20 17:19:55 -04:00

tests

am d652751d: am b6761e73: am 28fe43be: Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo

2010-07-16 16:25:27 -07:00