tree 9c0232f8eb1c6488cf7b36e4a400e4f9b2788ef8
parent 48229d77817bbf4c169787bef8faddd77bf890a1
parent 358ff29f38a57e3366c202e3f51fb332c93a7d39
author TreeHugger Robot <treehugger-gerrit@google.com> 1465345888 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1465345890 +0000

Merge "Move legacy full disk encryption code to Settings." into nyc-dev