tree 45d870e867449f27bde21b7935620f7268cb4bd7
parent e0e8aa1ebca8608ac50f20b3ad069bb95a0e5962
parent f0c71ceb8a9bbd9bbd793e599d08e29d77a509f8
author Alex Klyubin <klyubin@google.com> 1427854848 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427854848 +0000

am f0c71ceb: am 01e53ef1: am b7a34e49: Merge "Add license banner to recently added AndroidKeyStore files."

* commit 'f0c71ceb8a9bbd9bbd793e599d08e29d77a509f8':
  Add license banner to recently added AndroidKeyStore files.