OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c21e2cb d563ced)
am d563cede: am c4ad3cb0: Merge "Add support for common encryption" into jb-mr2-dev
authorMarco Nelissen <marcone@google.com>
Tue, 9 Apr 2013 00:06:03 +0000 (17:06 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 9 Apr 2013 00:06:03 +0000 (17:06 -0700)
* commit 'd563cede5cf4ca2647dcf00775dd0ed1dd08e792':
  Add support for common encryption


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