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:43:48 +0000 (00:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Jun 2016 00:43:48 +0000 (00:43 +0000)
am: 21c77ed1a8

Change-Id: I7c561e027b7216686b8d096ac97e6c6c5a633eaf


Trivial merge