OSDN Git Service

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

Change-Id: Ie2c8adbeefaab6f9fa1ff6802d938e31be065b84


Trivial merge