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 | efe6039f71e9bac2138003b3287e94a7ab7e5c55 (patch) | |
| tree | 7c7545aef44e4ee356f61b0379210f61b2a83691 /include/camera/Camera.h | |
| parent | 3cc219dfc67b866e10828f0c17641668d47c1cd8 (diff) | |
| parent | 68335fdd6e9c1d622384612605d6952503cb7fd0 (diff) | |
| download | frameworks_av-efe6039f71e9bac2138003b3287e94a7ab7e5c55.zip frameworks_av-efe6039f71e9bac2138003b3287e94a7ab7e5c55.tar.gz frameworks_av-efe6039f71e9bac2138003b3287e94a7ab7e5c55.tar.bz2 | |
Merge branch 'froyo' of git://android.git.kernel.org/platform/frameworks/base into HEAD
Diffstat (limited to 'include/camera/Camera.h')
| -rw-r--r-- | include/camera/Camera.h | 1 |
1 files changed, 0 insertions, 1 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. |