Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea32090d authored Jun 25, 2015 by Alex Klyubin Committed by Android Git Automerger Jun 25, 2015

am 22c11503: am e2b9af60: am c781405f: Merge "Use standard copyright banner in...

am 22c11503: am e2b9af60: am c781405f: Merge "Use standard copyright banner in android/security/keymaster." into mnc-dev

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

parents 477468b8 22c11503

core/java/android/security/keymaster/ExportResult.aidl

+3 −3

Original line number	Diff line number	Diff line
		/**
		* Copyright (c) 2015, The Android Open Source Project
		/*
		* Copyright (C) 2015 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.

core/java/android/security/keymaster/ExportResult.java

+3 −3

Original line number	Diff line number	Diff line
		/**
		* Copyright (c) 2015, The Android Open Source Project
		/*
		* Copyright (C) 2015 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.

core/java/android/security/keymaster/KeyCharacteristics.aidl

+3 −3

Original line number	Diff line number	Diff line
		/**
		* Copyright (c) 2015, The Android Open Source Project
		/*
		* Copyright (C) 2015 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.

core/java/android/security/keymaster/KeyCharacteristics.java

+2 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2015, The Android Open Source Project
		* Copyright (C) 2015 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.

core/java/android/security/keymaster/KeymasterArgument.java

+3 −3

Original line number	Diff line number	Diff line
		/**
		* Copyright (c) 2015, The Android Open Source Project
		/*
		* Copyright (C) 2015 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.