| commit | 82b451dacb4d12c3eee3fc2bde9d0f54e234c168 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Tue Dec 02 18:45:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 02 18:45:42 2014 +0000 |
| tree | 2579ddf7cfc6bdccd270738b1f4b5489d8262b57 | |
| parent | 6380bf4e7fd6a6c79f81c3df053ec745dcd8feed [diff] | |
| parent | d44a8f59a7518b87a3fe4174c78dfb9727e63f89 [diff] |
am d44a8f59: Merge "Fix encrypt-and-wipe" into lmp-mr1-dev * commit 'd44a8f59a7518b87a3fe4174c78dfb9727e63f89': Fix encrypt-and-wipe