tree 0673b6c9a88f7d215840240acdb3c6434cbc08f0
parent 90b1207b6c5fdff4ea1504a7f84b81ed0ab4daa2
parent c2ff2ec0d987dd1372183d2a18ea59a0c4d71c2c
author Andy Stadler <stadler@google.com> 1295634603 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295634603 -0800

am c2ff2ec0: Merge "Read actual device encryption status" into honeycomb

* commit 'c2ff2ec0d987dd1372183d2a18ea59a0c4d71c2c':
  Read actual device encryption status