OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c137e31 b7b7b5e)
am b7b7b5ec: Merge "Set error code on failed keyset manifest parsing." into mnc-dev
authordcashman <dcashman@google.com>
Tue, 26 May 2015 15:04:37 +0000 (15:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 26 May 2015 15:04:37 +0000 (15:04 +0000)
* commit 'b7b7b5ece86e32a7e5636d0c41c3dee373e8ac5a':
  Set error code on failed keyset manifest parsing.


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