OSDN Git Service

Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
authorJim Miller <jaggies@google.com>
Wed, 8 Jun 2016 00:38:29 +0000 (00:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Jun 2016 00:38:29 +0000 (00:38 +0000)
am: f8c64089b1

Change-Id: Ib227856dd007197a22b8ef2f27881dddd992b3b8


Trivial merge