OSDN Git Service

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)
commit22c115036c6f1d7d6ac0b9ab0c032816deefc2ae
tree895f7424f85685b50ca8e62e1b1853fe5f976f61
parent92b53c995031fdc74572ece122f43fb94173756c
parente2b9af60712bc7f4ae97f19efd2356996ab9100d
am e2b9af60: am c781405f: Merge "Use standard copyright banner in android/security/key" into mnc-dev

* commit 'e2b9af60712bc7f4ae97f19efd2356996ab9100d':
  Use standard copyright banner in android/security/keymaster.