tree fc3c5033e118f0b4569edd1166fac5c07b40f314
parent 500657387d834a8eb712e9c56bb00b64173cc1a9
parent 0fe45dea927dc87c19d6afd4502658b36177aa07
author Andy Stadler <stadler@google.com> 1295634466 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1295634466 -0800

Merge "Read actual device encryption status" into honeycomb