OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f09a297 3795f51)
am 3795f510: am 76e69417: am 8ab76778: Merge "KeyChain: return null instead of throw"
authorKenny Root <kroot@google.com>
Thu, 14 Feb 2013 00:04:03 +0000 (16:04 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 14 Feb 2013 00:04:03 +0000 (16:04 -0800)
# Via Android Git Automerger (2) and others
* commit '3795f510d313077308a065ae1fe15252d0e6d8b3':
  KeyChain: return null instead of throw


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