summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/ui/BasicIndicator.java
diff options
context:
space:
mode:
authorOwen Lin <owenlin@google.com>2010-05-14 14:31:06 +0800
committerOwen Lin <owenlin@google.com>2010-05-14 14:39:49 +0800
commitc4e6d563c3ae57e237952b82ad20ee693dfbf9d1 (patch)
tree1a64661f285ae6ddb745ce0dd07a1b1de33ad17f /src/com/android/camera/ui/BasicIndicator.java
parentbef57e1d1fbb1881a7e3a22bb7567e8e7c2f0795 (diff)
parentec1dfcb7314d10ff243a922fe4eff66ea699dd77 (diff)
downloadLegacyCamera-c4e6d563c3ae57e237952b82ad20ee693dfbf9d1.zip
LegacyCamera-c4e6d563c3ae57e237952b82ad20ee693dfbf9d1.tar.gz
LegacyCamera-c4e6d563c3ae57e237952b82ad20ee693dfbf9d1.tar.bz2
resolved conflicts for merge of ec1dfcb7 to kraken
Change-Id: I5ea57293d0b34f4189983c7a9851555bcf5f5232
Diffstat (limited to 'src/com/android/camera/ui/BasicIndicator.java')
-rw-r--r--src/com/android/camera/ui/BasicIndicator.java16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/com/android/camera/ui/BasicIndicator.java b/src/com/android/camera/ui/BasicIndicator.java
index 513b20d..bb1102c 100644
--- a/src/com/android/camera/ui/BasicIndicator.java
+++ b/src/com/android/camera/ui/BasicIndicator.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2010 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package com.android.camera.ui;
import android.content.Context;