Gilles Debunne d51fc1eaaa am 6c0694a8: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp ...

* commit '6c0694a8de2ec9157d018ac3a66606d3e26c1b53':
  Updated permission bullet
  Updated Help icon

2011-01-11 13:56:37 -08:00

..

config

…

java

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

2011-01-11 13:56:16 -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

am 48526d69: am eb97c0dd: Patch new JSON APIs with changes informed by GSON.

2011-01-10 13:01:44 -08:00