Ben Komalo 4b2efcb26f am 6c048260: Merge "Revert encryption mapping for device wipes." ...

* commit '6c048260f30d9bba1a83c4f79388cd6b3109be7d':
  Revert encryption mapping for device wipes.

2011-09-11 16:53:00 -07:00

..

java

am 6c048260: Merge "Revert encryption mapping for device wipes."

2011-09-11 16:53:00 -07:00

jni

am 6d172e60: Merge "Add error codes for channel disconnection / connection."

2011-09-09 15:21:53 -07:00

res

am 48b39148: Merge "Fix preference screen padding for legacy apps (non Holo)."

2011-09-11 15:59:47 -07:00

tests

Merge "Revert encryption mapping for device wipes."

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