OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92b53c9 e2b9af6)
am e2b9af60: am c781405f: Merge "Use standard copyright banner in android/security...
authorAlex Klyubin <klyubin@google.com>
Thu, 25 Jun 2015 16:02:00 +0000 (16:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 25 Jun 2015 16:02:00 +0000 (16:02 +0000)
* commit 'e2b9af60712bc7f4ae97f19efd2356996ab9100d':
  Use standard copyright banner in android/security/keymaster.


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