OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 301276c e36c415)
am a3cdaa53: Revert "Remove the APIs for the old encryption scheme."
authorJason parks <jparks@google.com>
Thu, 13 Jan 2011 20:18:40 +0000 (12:18 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Jan 2011 20:18:40 +0000 (12:18 -0800)
* commit 'a3cdaa5337fa573c4c61770195d6232c2e587090':
  Revert "Remove the APIs for the old encryption scheme."


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