Ben Komalo 6c048260f3 Merge "Revert encryption mapping for device wipes."

2011-09-11 16:48:32 -07:00

..

java

Merge "Revert encryption mapping for device wipes."

2011-09-11 16:48:32 -07:00

jni

Add error codes for channel disconnection / connection.

2011-09-08 15:26:53 -07:00

res

Fix preference screen padding for legacy apps (non Holo).

2011-09-11 13:19:14 -07:00

tests

Merge "Revert encryption mapping for device wipes."

2011-09-11 16:48:32 -07:00