tree d26cea0a9dd0a68af5ceb2f96db256a7aa3bfb0a
parent 51282faa8c429f63c03b4007d66371863e6e8c2d
author Oscar Montemayor <oam@google.com> 1267145222 -0800
committer Oscar Montemayor <oam@google.com> 1270167297 -0700

DO NOT MERGE
Encrypted File Systems integration. Recovery changes.

Change-Id: I932f73a6f937aac061128e1134eab08c30f0471d