OSDN Git Service

(root) / android-x86 / system-extras.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f78f80 3e1b7b1)
am 3e1b7b1e: (-s ours) am bc2eb8c3: (-s ours) DO NOT MERGE Securely encrypt the maste...
authorPaul Lawrence <paullawrence@google.com>
Fri, 29 May 2015 21:13:05 +0000 (21:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 29 May 2015 21:13:05 +0000 (21:13 +0000)
* commit '3e1b7b1e390b1f65d3eb2e957502ad00cd6a2fe6':
  DO NOT MERGE Securely encrypt the master key


Trivial merge
system/extras
About OSDN
Find Software
Develop Software
Help