OSDN Git Service

(root) / android-x86 / system-extras.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83a45f3 bc2eb8c)
am bc2eb8c3: (-s ours) DO NOT MERGE Securely encrypt the master key
authorPaul Lawrence <paullawrence@google.com>
Fri, 29 May 2015 21:02:36 +0000 (21:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 29 May 2015 21:02:36 +0000 (21:02 +0000)
* commit 'bc2eb8c3fd621605ff1ccaed04a71e6685acc974':
  DO NOT MERGE Securely encrypt the master key


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