OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0385dc8 c8b068c)
am c8b068ce: am cf2999aa: Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev
authorAlex Klyubin <klyubin@google.com>
Thu, 30 Apr 2015 21:20:56 +0000 (21:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Apr 2015 21:20:56 +0000 (21:20 +0000)
* commit 'c8b068ce477b3520a1ab20b7f29455d630724c38':
  Handle KM_ERROR_CALLER_NONCE_PROHIBITED.


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