Gilles Debunne 6c0694a8de Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp

2011-01-11 13:54:03 -08:00

..

config

…

java

am 240cf3d1: am f54ad8da: Clean up transceive().

2011-01-11 13:53:01 -08:00

jni

Fix start-time setreuid complaints.

2011-01-10 11:22:43 -08:00

res

Merge "Updated permission bullet" into honeycomb

2011-01-11 13:51:33 -08:00

tests

Patch new JSON APIs with changes informed by GSON.

2011-01-10 12:56:31 -08:00