OSDN Git Service

Merge "Merge \\"Move legacy full disk encryption code to Settings.\\" into nyc-dev...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Wed, 8 Jun 2016 00:46:12 +0000 (00:46 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 8 Jun 2016 00:46:14 +0000 (00:46 +0000)
commita8705f62ead383c458d3997e936dfa8c44b3b8e9
tree4e959876a57071ddba23b72274f4052b1e196b2e
parentb78840f14141fe2b3545e8dc84a8dc4f52a946ea
parent126a026393ccac2ee7d992927dc2996fa8de5c33
Merge "Merge \\"Move legacy full disk encryption code to Settings.\\" into nyc-dev am: 4401e24add am: 2cf5b73c0a" into nyc-mr1-dev-plus-aosp