| commit | 3b10d6195ad6d147d32306f734a64e50a51bbccd | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Mon Jul 13 15:11:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:11:35 2015 +0000 |
| tree | e650931d6cbab6062282ae77ef83a4cdb8e26090 | |
| parent | 830175fa76fea6dff1fc2e79adebfb515b9da993 [diff] | |
| parent | ccaca5cb8971837afe96f5b2940d266a95efd564 [diff] |
am ccaca5cb: Merge "Don\'t apply default encryption to /data/user, it should get per-user encryption." into mnc-dr-dev * commit 'ccaca5cb8971837afe96f5b2940d266a95efd564': Don't apply default encryption to /data/user, it should get per-user encryption.