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