| commit | 6102227b0ba7fccfd44c4d2038d1eb6e946147b5 | [log] [tgz] |
|---|---|---|
| author | Oscar Montemayor <oam@google.com> | Thu Apr 01 17:42:37 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 01 17:42:37 2010 -0700 |
| tree | d26cea0a9dd0a68af5ceb2f96db256a7aa3bfb0a | |
| parent | f33e24645b1531ed2abfe01d4e9cfb41637d2ee1 [diff] | |
| parent | 52219a68a83c47f8c5b93038f57f3f130e7d0823 [diff] |
am 52219a68: (-s ours) DO NOT MERGE Encrypted File Systems integration. Recovery changes.