tree 520f0a0c762ab79000753a51e202b07d78994132
parent 3d59e00f74fa6b866aba09628416555ce06f2bfe
parent 0050336a0a19019a68374b9eef51e00d6b242f57
author Paul Crowley <paulcrowley@google.com> 1431435409 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1431435411 +0000

Merge "Don't apply default encryption to /data/user, it should get per-user encryption."