diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-07-29 17:45:56 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-07-29 17:45:56 -0700 |
| commit | 27eecb704a27c1c73ed3449eba0307d8138b9c2e (patch) | |
| tree | 65bfdcc360ba98d1c639f2d77cb099c1fefeab0c /include | |
| parent | 3d8d9440d844816f065d2b10eb75bb693683cdad (diff) | |
| parent | 83407b993f79e06470100f605748aba41cbeb966 (diff) | |
| download | frameworks_base-27eecb704a27c1c73ed3449eba0307d8138b9c2e.zip frameworks_base-27eecb704a27c1c73ed3449eba0307d8138b9c2e.tar.gz frameworks_base-27eecb704a27c1c73ed3449eba0307d8138b9c2e.tar.bz2 | |
Merge branch 'froyo' of git://android.git.kernel.org/platform/frameworks/base into HEAD
Diffstat (limited to 'include')
| -rw-r--r-- | include/camera/Camera.h | 1 | ||||
| -rw-r--r-- | include/media/IMediaRecorder.h | 2 | ||||
| -rw-r--r-- | include/media/PVMediaRecorder.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/include/camera/Camera.h b/include/camera/Camera.h index ee2b30c..57968e3 100644 --- a/include/camera/Camera.h +++ b/include/camera/Camera.h @@ -1,6 +1,5 @@ /* * Copyright (C) 2008 The Android Open Source Project - * Copyright (C) 2008 HTC Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/include/media/IMediaRecorder.h b/include/media/IMediaRecorder.h index 24ac82b..73bf2ee 100644 --- a/include/media/IMediaRecorder.h +++ b/include/media/IMediaRecorder.h @@ -1,6 +1,6 @@ /* ** - ** Copyright 2008, HTC Inc. + ** Copyright 2008, 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. diff --git a/include/media/PVMediaRecorder.h b/include/media/PVMediaRecorder.h index 4f17c1a..2a1298a 100644 --- a/include/media/PVMediaRecorder.h +++ b/include/media/PVMediaRecorder.h @@ -1,6 +1,6 @@ /* ** - ** Copyright 2008, HTC Inc. + ** Copyright 2008, 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. |