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)
commitb78840f14141fe2b3545e8dc84a8dc4f52a946ea
tree4e959876a57071ddba23b72274f4052b1e196b2e
parent591c8ece751691c535fe5f8aed510620b21a4d1b
parent21c77ed1a87e3f1e6b1ea5f991bfc312376d6579
Merge \\"Move legacy full disk encryption code to Settings.\\" into nyc-dev am: 4401e24add
am: 21c77ed1a8

Change-Id: I7c561e027b7216686b8d096ac97e6c6c5a633eaf