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)
commit5b9fab40a0f1bcfdf1664f89f14b01d2282c0746
tree2f38901654781902906bbc46c6a1cecb284d1cf9
parentca24281df88030a6fb3e1c2b3fd104a78c8506b8
parentf8c64089b10acf0e43bb74c176379aa6ce1756e5
Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
am: f8c64089b1

Change-Id: Ib227856dd007197a22b8ef2f27881dddd992b3b8