OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 514c1ae 4401e24)
Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
authorJim Miller <jaggies@google.com>
Wed, 8 Jun 2016 00:38:31 +0000 (00:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Jun 2016 00:38:31 +0000 (00:38 +0000)
am: 4401e24add

Change-Id: Ic10c6505e4583f487a41eb659227b955013949b7


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help