Update copyright and add missing copyright

Also removed android intellisense perl file. s/tele/telephony/g Removed unused test_android.py Bug: 26083433 Change-Id: I19dd732dc1df788e3465c629d180a1981182c091
author: tturney <tturney@google.com> 2015-12-08 09:26:51 -0800
committer: tturney <tturney@google.com> 2015-12-08 16:24:13 -0800
commit: 03ca132d84e54dad461c37c545defcdeee33edd0 (patch)
tree: 22cf098b26dc403404437d172affad84e33b33fd /sl4a
parent: 3046cfd6546538b494a8b0bc378c56c8a8a057af (diff)
download: platform_packages_apps_Test_connectivity-03ca132d84e54dad461c37c545defcdeee33edd0.tar.gz
platform_packages_apps_Test_connectivity-03ca132d84e54dad461c37c545defcdeee33edd0.tar.bz2
platform_packages_apps_Test_connectivity-03ca132d84e54dad461c37c545defcdeee33edd0.zip
220 files changed, 1513 insertions, 488 deletions
diff --git a/sl4a/Common/Android.mk b/sl4a/Common/Android.mk
index 847b998..dcd469f 100644
--- a/sl4a/Common/Android.mk
+++ b/sl4a/Common/Android.mk
@@ -1,3 +1,18 @@
+#
+#  Copyright (C) 2015 Google, Inc.
+#
+#  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.
+#
 
 LOCAL_PATH := $(call my-dir)
 
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/Analytics.java b/sl4a/Common/src/com/googlecode/android_scripting/Analytics.java
index b1bf94c..38832e7 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/Analytics.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/Analytics.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2009 Google Inc.
- * 
+ * Copyright (C) 2015 Google Inc.
+ *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/BaseApplication.java b/sl4a/Common/src/com/googlecode/android_scripting/BaseApplication.java
index 1e24860..fce1f44 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/BaseApplication.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/BaseApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/Constants.java b/sl4a/Common/src/com/googlecode/android_scripting/Constants.java
index b6c366d..dc55c7e 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/Constants.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/Constants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/Exec.java b/sl4a/Common/src/com/googlecode/android_scripting/Exec.java
index d5fae79..cb95439 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/Exec.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/Exec.java
@@ -1,17 +1,17 @@
 /*
- * Copyright (C) 2007 The Android Open Source Project
+ * Copyright (C) 2015 Google Inc.
  *
- * 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
+ * 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
+ * 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.
+ * 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.googlecode.android_scripting;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/FeaturedInterpreters.java b/sl4a/Common/src/com/googlecode/android_scripting/FeaturedInterpreters.java
index 5056616..1d0eb90 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/FeaturedInterpreters.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/FeaturedInterpreters.java
@@ -1,4 +1,18 @@
-// Copyright 2010 Google Inc. All Rights Reserved.
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting;
 
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/FutureActivityTaskExecutor.java b/sl4a/Common/src/com/googlecode/android_scripting/FutureActivityTaskExecutor.java
index c7b6fc3..cb0371a 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/FutureActivityTaskExecutor.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/FutureActivityTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/IntentBuilders.java b/sl4a/Common/src/com/googlecode/android_scripting/IntentBuilders.java
index cdc1fe6..f129a41 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/IntentBuilders.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/IntentBuilders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/Process.java b/sl4a/Common/src/com/googlecode/android_scripting/Process.java
index b037244..8fbfe39 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/Process.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/Process.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/Version.java b/sl4a/Common/src/com/googlecode/android_scripting/Version.java
index f5907e4..d35e003 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/Version.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/Version.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2009 Google Inc.
- * 
+ * Copyright (C) 2015 Google Inc.
+ *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/activity/FutureActivity.java b/sl4a/Common/src/com/googlecode/android_scripting/activity/FutureActivity.java
index 42ce6b8..d2cdef2 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/activity/FutureActivity.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/activity/FutureActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/event/Event.java b/sl4a/Common/src/com/googlecode/android_scripting/event/Event.java
index 2dda722..0a23c54 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/event/Event.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/event/Event.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/ActivityResultFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/ActivityResultFacade.java
index 550e537..f0e3d62 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/ActivityResultFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/ActivityResultFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/AndroidFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/AndroidFacade.java
index 64a3e59..e20ac91 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/AndroidFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/AndroidFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/ApplicationManagerFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/ApplicationManagerFacade.java
index bc199d8..008e8e2 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/ApplicationManagerFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/ApplicationManagerFacade.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade;
 
 import android.app.ActivityManager;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/BatteryManagerFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/BatteryManagerFacade.java
index de90c7d..093da18 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/BatteryManagerFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/BatteryManagerFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/CameraFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/CameraFacade.java
index ff05312..b796455 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/CameraFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/CameraFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/CommonIntentsFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/CommonIntentsFacade.java
index 37d8374..11411c0 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/CommonIntentsFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/CommonIntentsFacade.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade;
 
 import android.app.SearchManager;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/ConnectivityManagerFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/ConnectivityManagerFacade.java
index 1a91812..2470b1d 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/ConnectivityManagerFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/ConnectivityManagerFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
@@ -34,7 +34,7 @@ import android.provider.Settings.SettingNotFoundException;
 import android.os.Bundle;
 
 import com.googlecode.android_scripting.Log;
-import com.googlecode.android_scripting.facade.tele.TelephonyConstants;
+import com.googlecode.android_scripting.facade.telephony.TelephonyConstants;
 import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
 import com.googlecode.android_scripting.rpc.Rpc;
 import com.googlecode.android_scripting.rpc.RpcOptional;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/ContactsFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/ContactsFacade.java
index fa34e9a..eb0c7ea 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/ContactsFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/ContactsFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/DisplayFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/DisplayFacade.java
index 54b402b..a321a26 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/DisplayFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/DisplayFacade.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade;
 
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/EventFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/EventFacade.java
index 620464c..adb9358 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/EventFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/EventFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/EventServer.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/EventServer.java
index 3b67fa4..2c8742f 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/EventServer.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/EventServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001 Naranjo Manuel Francisco <manuel@aircable.net>
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
@@ -13,6 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
+
 package com.googlecode.android_scripting.facade;
 
 import com.googlecode.android_scripting.Log;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/EyesFreeFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/EyesFreeFacade.java
index 3b79755..b32bf06 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/EyesFreeFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/EyesFreeFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/FacadeManager.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/FacadeManager.java
index 52555f4..dc7f19d 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/FacadeManager.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/FacadeManager.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade;
 
 import android.app.Service;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/FacadeManagerFactory.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/FacadeManagerFactory.java
index 2557cd8..0c8c51a 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/FacadeManagerFactory.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/FacadeManagerFactory.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade;
 
 import android.app.Service;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/LocationFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/LocationFacade.java
index 0f97f70..6f17d3f 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/LocationFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/LocationFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/PreferencesFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/PreferencesFacade.java
index dd788f8..8d39d2b 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/PreferencesFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/PreferencesFacade.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade;
 
 import android.app.Service;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/SensorManagerFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/SensorManagerFacade.java
index b98f936..b836457 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/SensorManagerFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/SensorManagerFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/SettingsFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/SettingsFacade.java
index 860aeb3..806b266 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/SettingsFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/SettingsFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/SignalStrengthFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/SignalStrengthFacade.java
index 2fed019..e650d11 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/SignalStrengthFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/SignalStrengthFacade.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade;
 
 import android.app.Service;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/SmsFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/SmsFacade.java
index 6046e7f..cf90fb6 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/SmsFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/SmsFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
@@ -65,7 +65,7 @@ import com.googlecode.android_scripting.rpc.Rpc;
 import com.googlecode.android_scripting.rpc.RpcDefault;
 import com.googlecode.android_scripting.rpc.RpcOptional;
 import com.googlecode.android_scripting.rpc.RpcParameter;
-import com.googlecode.android_scripting.facade.tele.TelephonyConstants;
+import com.googlecode.android_scripting.facade.telephony.TelephonyConstants;
 
 //FIXME: Change the build order to use constants defined in here
 //import com.googlecode.android_scripting.provider.TelephonyTestProvider;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/SpeechRecognitionFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/SpeechRecognitionFacade.java
index 63a9d73..5535f97 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/SpeechRecognitionFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/SpeechRecognitionFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/TextToSpeechFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/TextToSpeechFacade.java
index 9ffb8e5..cf5a250 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/TextToSpeechFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/TextToSpeechFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/ToneGeneratorFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/ToneGeneratorFacade.java
index 05b079f..b0c5240 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/ToneGeneratorFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/ToneGeneratorFacade.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade;
 
 import android.media.AudioManager;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/WakeLockFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/WakeLockFacade.java
index 85eac84..b741b7d 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/WakeLockFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/WakeLockFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothA2dpFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothA2dpFacade.java
index 23071d1..b09e741 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothA2dpFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothA2dpFacade.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade.bluetooth;
 
 import java.util.List;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothAvrcpFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothAvrcpFacade.java
index f336b4f..f702001 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothAvrcpFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothAvrcpFacade.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade.bluetooth;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothBroadcastHelper.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothBroadcastHelper.java
index 6a201b4..ec74520 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothBroadcastHelper.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothBroadcastHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothConnectionFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothConnectionFacade.java
index 95e44b0..8dbe9ac 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothConnectionFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothConnectionFacade.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade.bluetooth;
 
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothDiscoveryHelper.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothDiscoveryHelper.java
index 975f7be..0c24188 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothDiscoveryHelper.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothDiscoveryHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothFacade.java
index 01dcd4c..8a7bfe1 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothHidFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothHidFacade.java
index 2def196..2499229 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothHidFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothHidFacade.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade.bluetooth;
 
 import java.util.List;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothHspFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothHspFacade.java
index 8f39491..d1dec4d 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothHspFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothHspFacade.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade.bluetooth;
 
 import java.util.List;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeAdvertiseFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeAdvertiseFacade.java
index 5f1caaa..44b8443 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeAdvertiseFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeAdvertiseFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeScanFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeScanFacade.java
index d104f79..caf91e1 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeScanFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothLeScanFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothMapFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothMapFacade.java
index 889e8d8..2ccf25b 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothMapFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothMapFacade.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade.bluetooth;
 
 import java.util.List;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothPairingHelper.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothPairingHelper.java
index 1e98a15..a5c95e6 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothPairingHelper.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothPairingHelper.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade.bluetooth;
 
 import android.bluetooth.BluetoothDevice;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothRfcommFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothRfcommFacade.java
index bcf7b8c..cc2e08f 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothRfcommFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothRfcommFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/GattClientFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/GattClientFacade.java
index 3bbd71e..dddc224 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/GattClientFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/GattClientFacade.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade.bluetooth;
 
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/GattServerFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/GattServerFacade.java
index aef8c23..a191a73 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/GattServerFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/bluetooth/GattServerFacade.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade.bluetooth;
 
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/media/AudioManagerFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/media/AudioManagerFacade.java
index 94d8d01..d5820c1 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/media/AudioManagerFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/media/AudioManagerFacade.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade.media;
 
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/media/MediaButtonCallback.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/media/MediaButtonCallback.java
index 82f5382..2f2c02f 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/media/MediaButtonCallback.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/media/MediaButtonCallback.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade.media;
 
 import android.content.Intent;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/media/MediaPlayerFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/media/MediaPlayerFacade.java
index b307925..589fd06 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/media/MediaPlayerFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/media/MediaPlayerFacade.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade.media;
 
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/media/MediaRecorderFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/media/MediaRecorderFacade.java
index 58633c8..651b5af 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/media/MediaRecorderFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/media/MediaRecorderFacade.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2009 Google Inc.
- * 
+ * Copyright (C) 2015 Google Inc.
+ *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/media/MediaScannerFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/media/MediaScannerFacade.java
index 636cecd..c17859a 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/media/MediaScannerFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/media/MediaScannerFacade.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade.media;
 
 import android.app.Service;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/media/MediaSessionFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/media/MediaSessionFacade.java
index 097257e..1707032 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/media/MediaSessionFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/media/MediaSessionFacade.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade.media;
 
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/tele/ImsManagerFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/ImsManagerFacade.java
index 2cf0a38..630e9f8 100755
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/tele/ImsManagerFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/ImsManagerFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.googlecode.android_scripting.facade.tele;
+package com.googlecode.android_scripting.facade.telephony;
 
 import android.app.Service;
 import android.content.Context;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/tele/InCallServiceImpl.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/InCallServiceImpl.java
index 4142118..4a97931 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/tele/InCallServiceImpl.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/InCallServiceImpl.java
@@ -1,5 +1,20 @@
-
-package com.googlecode.android_scripting.facade.tele;
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade.telephony;
 
 import java.util.HashMap;
 import java.util.ArrayList;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/tele/PhoneFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/PhoneFacade.java
index c3e631e..7f35e7c 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/tele/PhoneFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/PhoneFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.googlecode.android_scripting.facade.tele;
+package com.googlecode.android_scripting.facade.telephony;
 
 import android.app.Activity;
 import android.app.Service;
@@ -49,15 +49,15 @@ import android.os.SystemProperties;
 import com.googlecode.android_scripting.facade.AndroidFacade;
 import com.googlecode.android_scripting.facade.EventFacade;
 import com.googlecode.android_scripting.facade.FacadeManager;
-import com.googlecode.android_scripting.facade.tele.TelephonyStateListeners
+import com.googlecode.android_scripting.facade.telephony.TelephonyStateListeners
                                                    .CallStateChangeListener;
-import com.googlecode.android_scripting.facade.tele.TelephonyStateListeners
+import com.googlecode.android_scripting.facade.telephony.TelephonyStateListeners
                                                    .DataConnectionRealTimeInfoChangeListener;
-import com.googlecode.android_scripting.facade.tele.TelephonyStateListeners
+import com.googlecode.android_scripting.facade.telephony.TelephonyStateListeners
                                                    .DataConnectionStateChangeListener;
-import com.googlecode.android_scripting.facade.tele.TelephonyStateListeners
+import com.googlecode.android_scripting.facade.telephony.TelephonyStateListeners
                                                    .ServiceStateChangeListener;
-import com.googlecode.android_scripting.facade.tele.TelephonyStateListeners
+import com.googlecode.android_scripting.facade.telephony.TelephonyStateListeners
                                                    .VoiceMailStateChangeListener;
 import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
 import com.googlecode.android_scripting.rpc.Rpc;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/tele/SubscriptionManagerFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/SubscriptionManagerFacade.java
index 8f23b27..a7a339d 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/tele/SubscriptionManagerFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/SubscriptionManagerFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.googlecode.android_scripting.facade.tele;
+package com.googlecode.android_scripting.facade.telephony;
 
 import android.app.Service;
 import android.content.Context;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/tele/TelecomCallFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/TelecomCallFacade.java
index 1c999bb..8c7697e 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/tele/TelecomCallFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/TelecomCallFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.googlecode.android_scripting.facade.tele;
+package com.googlecode.android_scripting.facade.telephony;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/tele/TelecomManagerFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/TelecomManagerFacade.java
index e952a73..7516e81 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/tele/TelecomManagerFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/TelecomManagerFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.googlecode.android_scripting.facade.tele;
+package com.googlecode.android_scripting.facade.telephony;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/tele/TelephonyConstants.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyConstants.java
index 5a108fc..e55edbf 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/tele/TelephonyConstants.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyConstants.java
@@ -1,4 +1,20 @@
-package com.googlecode.android_scripting.facade.tele;
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade.telephony;
 
 public class TelephonyConstants {
     /**
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/tele/TelephonyStateListeners.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyStateListeners.java
index 1c4bd1e..8d9bfad 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/tele/TelephonyStateListeners.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyStateListeners.java
@@ -1,4 +1,19 @@
-package com.googlecode.android_scripting.facade.tele;
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade.telephony;
 
 import com.googlecode.android_scripting.facade.EventFacade;
 import com.googlecode.android_scripting.Log;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/tele/TelephonyUtils.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyUtils.java
index 14c13a7..85c5864 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/tele/TelephonyUtils.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyUtils.java
@@ -1,4 +1,20 @@
-package com.googlecode.android_scripting.facade.tele;
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade.telephony;
 import com.android.internal.telephony.RILConstants;
 import com.googlecode.android_scripting.Log;
 import android.telephony.ServiceState;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/AlertDialogTask.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/AlertDialogTask.java
index da085b6..4e1910e 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/AlertDialogTask.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/AlertDialogTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.java
index 26b916d..f193d75 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/DatePickerDialogTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/DialogTask.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/DialogTask.java
index ea35e91..31e6cd5 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/DialogTask.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/DialogTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/FullScreenTask.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/FullScreenTask.java
index 7411b8c..d4b52db 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/FullScreenTask.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/FullScreenTask.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade.ui;
 
 import android.R;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/ProgressDialogTask.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/ProgressDialogTask.java
index 683463f..b8f76c4 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/ProgressDialogTask.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/ProgressDialogTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.java
index 5643f9d..73f4de1 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/SeekBarDialogTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/TimePickerDialogTask.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/TimePickerDialogTask.java
index 21acf86..8a348f6 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/TimePickerDialogTask.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/TimePickerDialogTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/UiFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/UiFacade.java
index a263328..f338e08 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/UiFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/UiFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/ViewInflater.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/ViewInflater.java
index d14204a..d60198b 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/ViewInflater.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/ui/ViewInflater.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.facade.ui;
 
 import android.app.Activity;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/future/FutureActivityTask.java b/sl4a/Common/src/com/googlecode/android_scripting/future/FutureActivityTask.java
index 3804604..aabd086 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/future/FutureActivityTask.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/future/FutureActivityTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/interpreter/InProcessInterpreter.java b/sl4a/Common/src/com/googlecode/android_scripting/interpreter/InProcessInterpreter.java
index ec4d400..05515b4 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/interpreter/InProcessInterpreter.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/interpreter/InProcessInterpreter.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.interpreter;
 
 import java.io.FileDescriptor;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/interpreter/Interpreter.java b/sl4a/Common/src/com/googlecode/android_scripting/interpreter/Interpreter.java
index 99cd200..1b50177 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/interpreter/Interpreter.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/interpreter/Interpreter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/interpreter/InterpreterConfiguration.java b/sl4a/Common/src/com/googlecode/android_scripting/interpreter/InterpreterConfiguration.java
index 791b543..49840f1 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/interpreter/InterpreterConfiguration.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/interpreter/InterpreterConfiguration.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2009 Google Inc.
- * 
+ * Copyright (C) 2015 Google Inc.
+ *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/interpreter/html/HtmlActivityTask.java b/sl4a/Common/src/com/googlecode/android_scripting/interpreter/html/HtmlActivityTask.java
index 56c351b..04d8c52 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/interpreter/html/HtmlActivityTask.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/interpreter/html/HtmlActivityTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.java b/sl4a/Common/src/com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.java
index 04d40fa..8895e8a 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/interpreter/html/HtmlInterpreter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/interpreter/shell/ShellInterpreter.java b/sl4a/Common/src/com/googlecode/android_scripting/interpreter/shell/ShellInterpreter.java
index 1f6a248..327603f 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/interpreter/shell/ShellInterpreter.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/interpreter/shell/ShellInterpreter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java b/sl4a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java
index 84f4ab6..a1fe400 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
@@ -95,8 +95,8 @@ import com.googlecode.android_scripting.ConvertUtils;
 import com.googlecode.android_scripting.Log;
 import com.googlecode.android_scripting.event.Event;
 //FIXME: Refactor classes, constants and conversions out of here
-import com.googlecode.android_scripting.facade.tele.InCallServiceImpl;
-import com.googlecode.android_scripting.facade.tele.TelephonyUtils;
+import com.googlecode.android_scripting.facade.telephony.InCallServiceImpl;
+import com.googlecode.android_scripting.facade.telephony.TelephonyUtils;
 
 public class JsonBuilder {
 
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonRpcResult.java b/sl4a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonRpcResult.java
index d2dfe1c..bba44d9 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonRpcResult.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonRpcResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonRpcServer.java b/sl4a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonRpcServer.java
index 9c3ec02..f46b4d0 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonRpcServer.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonRpcServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/jsonrpc/RpcReceiver.java b/sl4a/Common/src/com/googlecode/android_scripting/jsonrpc/RpcReceiver.java
index fa79d03..0c3f339 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/jsonrpc/RpcReceiver.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/jsonrpc/RpcReceiver.java
@@ -1,4 +1,18 @@
-// Copyright 2010 Google Inc. All Rights Reserved.
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.jsonrpc;
 
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.java b/sl4a/Common/src/com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.java
index 4c0e146..029fc15 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/jsonrpc/RpcReceiverManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.java b/sl4a/Common/src/com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.java
index 6e03078..0449dd0 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/jsonrpc/RpcReceiverManagerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/language/BeanShellLanguage.java b/sl4a/Common/src/com/googlecode/android_scripting/language/BeanShellLanguage.java
index b6751e1..e27f334 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/language/BeanShellLanguage.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/language/BeanShellLanguage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/language/HtmlLanguage.java b/sl4a/Common/src/com/googlecode/android_scripting/language/HtmlLanguage.java
index 73e7e6d..ddf2870 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/language/HtmlLanguage.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/language/HtmlLanguage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/language/JavaScriptLanguage.java b/sl4a/Common/src/com/googlecode/android_scripting/language/JavaScriptLanguage.java
index a56400e..f3ddf08 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/language/JavaScriptLanguage.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/language/JavaScriptLanguage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/language/Language.java b/sl4a/Common/src/com/googlecode/android_scripting/language/Language.java
index cc5a3ed..d76062b 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/language/Language.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/language/Language.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/language/LuaLanguage.java b/sl4a/Common/src/com/googlecode/android_scripting/language/LuaLanguage.java
index 2d986fb..4196806 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/language/LuaLanguage.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/language/LuaLanguage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/language/PerlLanguage.java b/sl4a/Common/src/com/googlecode/android_scripting/language/PerlLanguage.java
index fae7772..16afee1 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/language/PerlLanguage.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/language/PerlLanguage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/language/PhpLanguage.java b/sl4a/Common/src/com/googlecode/android_scripting/language/PhpLanguage.java
index 0124648..919c175 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/language/PhpLanguage.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/language/PhpLanguage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Irontec SL
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/language/PythonLanguage.java b/sl4a/Common/src/com/googlecode/android_scripting/language/PythonLanguage.java
index 2e89485..99dd290 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/language/PythonLanguage.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/language/PythonLanguage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/language/RubyLanguage.java b/sl4a/Common/src/com/googlecode/android_scripting/language/RubyLanguage.java
index 0fe5524..5fafc4d 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/language/RubyLanguage.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/language/RubyLanguage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/language/ShellLanguage.java b/sl4a/Common/src/com/googlecode/android_scripting/language/ShellLanguage.java
index 1fc1d59..d8680c2 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/language/ShellLanguage.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/language/ShellLanguage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/language/SleepLanguage.java b/sl4a/Common/src/com/googlecode/android_scripting/language/SleepLanguage.java
index e1a4247..16af07f 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/language/SleepLanguage.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/language/SleepLanguage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/language/SquirrelLanguage.java b/sl4a/Common/src/com/googlecode/android_scripting/language/SquirrelLanguage.java
index d2e78db..ca6dbd4 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/language/SquirrelLanguage.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/language/SquirrelLanguage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/language/SupportedLanguages.java b/sl4a/Common/src/com/googlecode/android_scripting/language/SupportedLanguages.java
index 8ce9b0f..0eca2a0 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/language/SupportedLanguages.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/language/SupportedLanguages.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.language;
 
 import com.googlecode.android_scripting.Log;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/language/TclLanguage.java b/sl4a/Common/src/com/googlecode/android_scripting/language/TclLanguage.java
index ec1682c..909b2ea 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/language/TclLanguage.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/language/TclLanguage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/rpc/Converter.java b/sl4a/Common/src/com/googlecode/android_scripting/rpc/Converter.java
index 5b9ea68..1272f6c 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/rpc/Converter.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/rpc/Converter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/rpc/MethodDescriptor.java b/sl4a/Common/src/com/googlecode/android_scripting/rpc/MethodDescriptor.java
index 4f50455..e86ecce 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/rpc/MethodDescriptor.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/rpc/MethodDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/rpc/ParameterDescriptor.java b/sl4a/Common/src/com/googlecode/android_scripting/rpc/ParameterDescriptor.java
index 166d69a..f68b674 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/rpc/ParameterDescriptor.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/rpc/ParameterDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/rpc/Rpc.java b/sl4a/Common/src/com/googlecode/android_scripting/rpc/Rpc.java
index 2988130..0c292d7 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/rpc/Rpc.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/rpc/Rpc.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2009 Google Inc.
- * 
+ * Copyright (C) 2015 Google Inc.
+ *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcDefault.java b/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcDefault.java
index 42b23b1..aa38a0a 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcDefault.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcDefault.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcDeprecated.java b/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcDeprecated.java
index 3ad3f14..3f6e64d 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcDeprecated.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcDeprecated.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcError.java b/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcError.java
index 9a79108..56b178b 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcError.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcMinSdk.java b/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcMinSdk.java
index 9548ec6..08c8421 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcMinSdk.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcMinSdk.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcName.java b/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcName.java
index 243fc76..7744737 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcName.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcOptional.java b/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcOptional.java
index fed5647..665f05c 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcOptional.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcOptional.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcParameter.java b/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcParameter.java
index 7d0f830..5c47b62 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcParameter.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcParameter.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2009 Google Inc.
- * 
+ * Copyright (C) 2015 Google Inc.
+ *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcStartEvent.java b/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcStartEvent.java
index 7893860..c1c489b 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcStartEvent.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcStartEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcStopEvent.java b/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcStopEvent.java
index 7753865..02f30ab 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcStopEvent.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/rpc/RpcStopEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/trigger/ScriptTrigger.java b/sl4a/Common/src/com/googlecode/android_scripting/trigger/ScriptTrigger.java
index 4a10ca1..dc60b81 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/trigger/ScriptTrigger.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/trigger/ScriptTrigger.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.trigger;
 
 import android.content.Context;
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/trigger/Trigger.java b/sl4a/Common/src/com/googlecode/android_scripting/trigger/Trigger.java
index dceb63b..ac5f281 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/trigger/Trigger.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/trigger/Trigger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/trigger/TriggerRepository.java b/sl4a/Common/src/com/googlecode/android_scripting/trigger/TriggerRepository.java
index c861179..c5bc622 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/trigger/TriggerRepository.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/trigger/TriggerRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/util/VisibleForTesting.java b/sl4a/Common/src/com/googlecode/android_scripting/util/VisibleForTesting.java
index 5b531c1..befd98a 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/util/VisibleForTesting.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/util/VisibleForTesting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/webcam/JpegProvider.java b/sl4a/Common/src/com/googlecode/android_scripting/webcam/JpegProvider.java
index 7d28179..4a3ba86 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/webcam/JpegProvider.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/webcam/JpegProvider.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.webcam;
 
 interface JpegProvider {
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/webcam/MjpegServer.java b/sl4a/Common/src/com/googlecode/android_scripting/webcam/MjpegServer.java
index 14a8b66..bba4e4f 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/webcam/MjpegServer.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/webcam/MjpegServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/webcam/WebCamFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/webcam/WebCamFacade.java
index 85d0243..a2de6ca 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/webcam/WebCamFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/webcam/WebCamFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/InterpreterForAndroid/Android.mk b/sl4a/InterpreterForAndroid/Android.mk
index 9a28b75..a04d9b4 100644
--- a/sl4a/InterpreterForAndroid/Android.mk
+++ b/sl4a/InterpreterForAndroid/Android.mk
@@ -1,3 +1,18 @@
+#
+#  Copyright (C) 2015 Google, Inc.
+#
+#  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.
+#
 
 LOCAL_PATH := $(call my-dir)
 
diff --git a/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/AsyncTaskListener.java b/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/AsyncTaskListener.java
index dd81525..b80315a 100644
--- a/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/AsyncTaskListener.java
+++ b/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/AsyncTaskListener.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2010 Google Inc.
- * 
+ * Copyright (C) 2015 Google Inc.
+ *
  * 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
diff --git a/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/InterpreterInstaller.java b/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/InterpreterInstaller.java
index f6dc25c..ce5d5f9 100644
--- a/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/InterpreterInstaller.java
+++ b/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/InterpreterInstaller.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2010 Google Inc.
- * 
+ * Copyright (C) 2015 Google Inc.
+ *
  * 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
diff --git a/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/InterpreterUninstaller.java b/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/InterpreterUninstaller.java
index 81e9caa..dd52864 100644
--- a/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/InterpreterUninstaller.java
+++ b/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/InterpreterUninstaller.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2010 Google Inc.
- * 
+ * Copyright (C) 2015 Google Inc.
+ *
  * 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
diff --git a/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/UrlDownloaderTask.java b/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/UrlDownloaderTask.java
index 08292e3..93134b4 100644
--- a/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/UrlDownloaderTask.java
+++ b/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/UrlDownloaderTask.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2010 Google Inc.
- * 
+ * Copyright (C) 2015 Google Inc.
+ *
  * 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
diff --git a/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/ZipExtractorTask.java b/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/ZipExtractorTask.java
index fe5dadb..ccc99fe 100644
--- a/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/ZipExtractorTask.java
+++ b/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/ZipExtractorTask.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2010 Google Inc.
- * 
+ * Copyright (C) 2015 Google Inc.
+ *
  * 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
diff --git a/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/activity/Main.java b/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/activity/Main.java
index 6b2048e..402110c 100644
--- a/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/activity/Main.java
+++ b/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/activity/Main.java
@@ -1,11 +1,12 @@
 /*
- * 
+ * Copyright (C) 2015 Google Inc.
+ *
  * 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
diff --git a/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/interpreter/InterpreterProvider.java b/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/interpreter/InterpreterProvider.java
index af7cda7..fc1f0c9 100644
--- a/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/interpreter/InterpreterProvider.java
+++ b/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/interpreter/InterpreterProvider.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2010 Google Inc.
- * 
+ * Copyright (C) 2015 Google Inc.
+ *
  * 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
diff --git a/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/interpreter/Sl4aHostedInterpreter.java b/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/interpreter/Sl4aHostedInterpreter.java
index fad1ae5..9d51586 100644
--- a/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/interpreter/Sl4aHostedInterpreter.java
+++ b/sl4a/InterpreterForAndroid/src/com/googlecode/android_scripting/interpreter/Sl4aHostedInterpreter.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2010 Google Inc.
- * 
+ * Copyright (C) 2015 Google Inc.
+ *
  * 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
diff --git a/sl4a/QuickAction/Android.mk b/sl4a/QuickAction/Android.mk
index 077f3ae..f8a942f 100644
--- a/sl4a/QuickAction/Android.mk
+++ b/sl4a/QuickAction/Android.mk
@@ -1,3 +1,18 @@
+#
+#  Copyright (C) 2015 Google, Inc.
+#
+#  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.
+#
 
 LOCAL_PATH := $(call my-dir)
 
diff --git a/sl4a/QuickAction/AndroidManifest.xml b/sl4a/QuickAction/AndroidManifest.xml
index 3645d07..dbc6573 100644
--- a/sl4a/QuickAction/AndroidManifest.xml
+++ b/sl4a/QuickAction/AndroidManifest.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
+-->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="net.londatiga.android"
     android:versionCode="1"
diff --git a/sl4a/QuickAction/res/anim/grow_from_bottom.xml b/sl4a/QuickAction/res/anim/grow_from_bottom.xml
index d2a371d..74b817a 100644
--- a/sl4a/QuickAction/res/anim/grow_from_bottom.xml
+++ b/sl4a/QuickAction/res/anim/grow_from_bottom.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
+-->
+
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 	<scale
 		android:fromXScale="0.3" android:toXScale="1.0"
diff --git a/sl4a/QuickAction/res/anim/grow_from_bottomleft_to_topright.xml b/sl4a/QuickAction/res/anim/grow_from_bottomleft_to_topright.xml
index a4bf4ea..72c41d3 100644
--- a/sl4a/QuickAction/res/anim/grow_from_bottomleft_to_topright.xml
+++ b/sl4a/QuickAction/res/anim/grow_from_bottomleft_to_topright.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
+-->
+
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 	<scale
 		android:fromXScale="0.3" android:toXScale="1.0"
diff --git a/sl4a/QuickAction/res/anim/grow_from_bottomright_to_topleft.xml b/sl4a/QuickAction/res/anim/grow_from_bottomright_to_topleft.xml
index 3446623..af90ea6 100644
--- a/sl4a/QuickAction/res/anim/grow_from_bottomright_to_topleft.xml
+++ b/sl4a/QuickAction/res/anim/grow_from_bottomright_to_topleft.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
+-->
+
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 	<scale
 		android:fromXScale="0.3" android:toXScale="1.0"
diff --git a/sl4a/QuickAction/res/anim/grow_from_top.xml b/sl4a/QuickAction/res/anim/grow_from_top.xml
index ffd722c..a1715c4 100644
--- a/sl4a/QuickAction/res/anim/grow_from_top.xml
+++ b/sl4a/QuickAction/res/anim/grow_from_top.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
+-->
+
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 	<scale
 		android:fromXScale="0.3" android:toXScale="1.0"
diff --git a/sl4a/QuickAction/res/anim/grow_from_topleft_to_bottomright.xml b/sl4a/QuickAction/res/anim/grow_from_topleft_to_bottomright.xml
index b67ebe5..3f9d7e9 100644
--- a/sl4a/QuickAction/res/anim/grow_from_topleft_to_bottomright.xml
+++ b/sl4a/QuickAction/res/anim/grow_from_topleft_to_bottomright.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
+-->
+
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 	<scale
 		android:fromXScale="0.3" android:toXScale="1.0"
diff --git a/sl4a/QuickAction/res/anim/grow_from_topright_to_bottomleft.xml b/sl4a/QuickAction/res/anim/grow_from_topright_to_bottomleft.xml
index d4744f6..4abf0f1 100644
--- a/sl4a/QuickAction/res/anim/grow_from_topright_to_bottomleft.xml
+++ b/sl4a/QuickAction/res/anim/grow_from_topright_to_bottomleft.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
+-->
+
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 	<scale
 		android:fromXScale="0.3" android:toXScale="1.0"
diff --git a/sl4a/QuickAction/res/anim/rail.xml b/sl4a/QuickAction/res/anim/rail.xml
index 2fdbe38..f3b2d9e 100644
--- a/sl4a/QuickAction/res/anim/rail.xml
+++ b/sl4a/QuickAction/res/anim/rail.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
+-->
 
 <translate
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/sl4a/QuickAction/res/anim/shrink_from_bottom.xml b/sl4a/QuickAction/res/anim/shrink_from_bottom.xml
index a98d592..61b8f0c 100644
--- a/sl4a/QuickAction/res/anim/shrink_from_bottom.xml
+++ b/sl4a/QuickAction/res/anim/shrink_from_bottom.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
+-->
+
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 	<scale
 		android:fromXScale="1.0" android:toXScale="0.3"
diff --git a/sl4a/QuickAction/res/anim/shrink_from_bottomleft_to_topright.xml b/sl4a/QuickAction/res/anim/shrink_from_bottomleft_to_topright.xml
index 6e56c1e..9d9cdff 100644
--- a/sl4a/QuickAction/res/anim/shrink_from_bottomleft_to_topright.xml
+++ b/sl4a/QuickAction/res/anim/shrink_from_bottomleft_to_topright.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
+-->
+
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 	<scale
 		android:fromXScale="1.0" android:toXScale="0.3"
diff --git a/sl4a/QuickAction/res/anim/shrink_from_bottomright_to_topleft.xml b/sl4a/QuickAction/res/anim/shrink_from_bottomright_to_topleft.xml
index d4ed513..da6a2ca 100644
--- a/sl4a/QuickAction/res/anim/shrink_from_bottomright_to_topleft.xml
+++ b/sl4a/QuickAction/res/anim/shrink_from_bottomright_to_topleft.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
+-->
+
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 	<scale
 		android:fromXScale="1.0" android:toXScale="0.3"
diff --git a/sl4a/QuickAction/res/anim/shrink_from_top.xml b/sl4a/QuickAction/res/anim/shrink_from_top.xml
index 89cd8f4..91596e2 100644
--- a/sl4a/QuickAction/res/anim/shrink_from_top.xml
+++ b/sl4a/QuickAction/res/anim/shrink_from_top.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
+-->
+
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 	<scale
 		android:fromXScale="1.0" android:toXScale="0.3"
diff --git a/sl4a/QuickAction/res/anim/shrink_from_topleft_to_bottomright.xml b/sl4a/QuickAction/res/anim/shrink_from_topleft_to_bottomright.xml
index 1341728..4ce1cd2 100644
--- a/sl4a/QuickAction/res/anim/shrink_from_topleft_to_bottomright.xml
+++ b/sl4a/QuickAction/res/anim/shrink_from_topleft_to_bottomright.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
+-->
+
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 	<scale
 		android:fromXScale="1.0" android:toXScale="0.3"
diff --git a/sl4a/QuickAction/res/anim/shrink_from_topright_to_bottomleft.xml b/sl4a/QuickAction/res/anim/shrink_from_topright_to_bottomleft.xml
index d4064fc..d68c568 100644
--- a/sl4a/QuickAction/res/anim/shrink_from_topright_to_bottomleft.xml
+++ b/sl4a/QuickAction/res/anim/shrink_from_topright_to_bottomleft.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
+-->
+
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 	<scale
 		android:fromXScale="1.0" android:toXScale="0.3"
diff --git a/sl4a/QuickAction/res/drawable-finger/quickcontact_slider_btn.xml b/sl4a/QuickAction/res/drawable-finger/quickcontact_slider_btn.xml
index a1be8f4..41693b4 100644
--- a/sl4a/QuickAction/res/drawable-finger/quickcontact_slider_btn.xml
+++ b/sl4a/QuickAction/res/drawable-finger/quickcontact_slider_btn.xml
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
 -->
 
+
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
     android:dither="true">
 
diff --git a/sl4a/QuickAction/res/drawable/quickcontact_slider_btn.xml b/sl4a/QuickAction/res/drawable/quickcontact_slider_btn.xml
index 9745060..5aca7bc 100644
--- a/sl4a/QuickAction/res/drawable/quickcontact_slider_btn.xml
+++ b/sl4a/QuickAction/res/drawable/quickcontact_slider_btn.xml
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
 -->
 
+
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
     android:dither="true">
 
diff --git a/sl4a/QuickAction/res/layout/action_item.xml b/sl4a/QuickAction/res/layout/action_item.xml
index bf368b9..ec76f9f 100644
--- a/sl4a/QuickAction/res/layout/action_item.xml
+++ b/sl4a/QuickAction/res/layout/action_item.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
+-->
+
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
   android:orientation="horizontal"
diff --git a/sl4a/QuickAction/res/layout/quickaction.xml b/sl4a/QuickAction/res/layout/quickaction.xml
index 54a920b..28256cb 100644
--- a/sl4a/QuickAction/res/layout/quickaction.xml
+++ b/sl4a/QuickAction/res/layout/quickaction.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
+-->
+
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
diff --git a/sl4a/QuickAction/res/values/strings.xml b/sl4a/QuickAction/res/values/strings.xml
index e97e6f0..edec82d 100644
--- a/sl4a/QuickAction/res/values/strings.xml
+++ b/sl4a/QuickAction/res/values/strings.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
+-->
+
 <resources>
     <string name="app_name">QuickActions Demo</string>
 </resources>
 \ No newline at end of file
diff --git a/sl4a/QuickAction/res/values/styles.xml b/sl4a/QuickAction/res/values/styles.xml
index 10a6710..3d13e04 100644
--- a/sl4a/QuickAction/res/values/styles.xml
+++ b/sl4a/QuickAction/res/values/styles.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
+-->
+
 <resources>
 	<style name="Animations" />
   
diff --git a/sl4a/ScriptingLayer/Android.mk b/sl4a/ScriptingLayer/Android.mk
index c441f4c..ac430ba 100644
--- a/sl4a/ScriptingLayer/Android.mk
+++ b/sl4a/ScriptingLayer/Android.mk
@@ -1,3 +1,18 @@
+#
+#  Copyright (C) 2015 Google, Inc.
+#
+#  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.
+#
 
 LOCAL_PATH := $(call my-dir)
 
diff --git a/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/AndroidProxy.java b/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/AndroidProxy.java
index fad283b..cd64700 100644
--- a/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/AndroidProxy.java
+++ b/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/AndroidProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/ScriptLauncher.java b/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/ScriptLauncher.java
index 8e0db8e..216c7bc 100644
--- a/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/ScriptLauncher.java
+++ b/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/ScriptLauncher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/ScriptProcess.java b/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/ScriptProcess.java
index 7187b09..71e639c 100644
--- a/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/ScriptProcess.java
+++ b/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/ScriptProcess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/ScriptStorageAdapter.java b/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/ScriptStorageAdapter.java
index ce5a008..ad9ca8d 100644
--- a/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/ScriptStorageAdapter.java
+++ b/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/ScriptStorageAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/facade/FacadeConfiguration.java b/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/facade/FacadeConfiguration.java
index 3bb91f9..4413e07 100644
--- a/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/facade/FacadeConfiguration.java
+++ b/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/facade/FacadeConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
@@ -45,11 +45,11 @@ import com.googlecode.android_scripting.facade.media.MediaPlayerFacade;
 import com.googlecode.android_scripting.facade.media.MediaRecorderFacade;
 import com.googlecode.android_scripting.facade.media.MediaScannerFacade;
 import com.googlecode.android_scripting.facade.media.MediaSessionFacade;
-import com.googlecode.android_scripting.facade.tele.ImsManagerFacade;
-import com.googlecode.android_scripting.facade.tele.PhoneFacade;
-import com.googlecode.android_scripting.facade.tele.TelecomManagerFacade;
-import com.googlecode.android_scripting.facade.tele.SubscriptionManagerFacade;
-import com.googlecode.android_scripting.facade.tele.TelecomCallFacade;
+import com.googlecode.android_scripting.facade.telephony.ImsManagerFacade;
+import com.googlecode.android_scripting.facade.telephony.PhoneFacade;
+import com.googlecode.android_scripting.facade.telephony.TelecomManagerFacade;
+import com.googlecode.android_scripting.facade.telephony.SubscriptionManagerFacade;
+import com.googlecode.android_scripting.facade.telephony.TelecomCallFacade;
 import com.googlecode.android_scripting.facade.ui.UiFacade;
 import com.googlecode.android_scripting.facade.wifi.HttpFacade;
 import com.googlecode.android_scripting.facade.wifi.WifiManagerFacade;
diff --git a/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/interpreter/InterpreterProcess.java b/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/interpreter/InterpreterProcess.java
index a2d9fb6..98b0211 100644
--- a/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/interpreter/InterpreterProcess.java
+++ b/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/interpreter/InterpreterProcess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/trigger/EventGenerationControllingObserver.java b/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/trigger/EventGenerationControllingObserver.java
index 1a5fc8c..37cd7e6 100644
--- a/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/trigger/EventGenerationControllingObserver.java
+++ b/sl4a/ScriptingLayer/src/com/googlecode/android_scripting/trigger/EventGenerationControllingObserver.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.trigger;
 
 import com.google.common.collect.Maps;
diff --git a/sl4a/ScriptingLayerForAndroid/Android.mk b/sl4a/ScriptingLayerForAndroid/Android.mk
index 4f37513..5320eca 100644
--- a/sl4a/ScriptingLayerForAndroid/Android.mk
+++ b/sl4a/ScriptingLayerForAndroid/Android.mk
@@ -1,3 +1,19 @@
+#
+#  Copyright (C) 2015 Google, Inc.
+#
+#  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.
+#
+
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
diff --git a/sl4a/ScriptingLayerForAndroid/AndroidManifest.xml b/sl4a/ScriptingLayerForAndroid/AndroidManifest.xml
index 0a72a6e..69750a2 100644
--- a/sl4a/ScriptingLayerForAndroid/AndroidManifest.xml
+++ b/sl4a/ScriptingLayerForAndroid/AndroidManifest.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
+-->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.googlecode.android_scripting" android:installLocation="auto" android:versionCode="603" android:versionName="6x03"
     android:sharedUserId="android.uid.system">
     <permission android:name="com.android.permission.WHITELIST_BLUETOOTH_DEVICE"
@@ -166,7 +184,7 @@
         <activity android:name="org.connectbot.HelpTopicActivity" android:configChanges="keyboardHidden|orientation" />
         <service android:name=".activity.ScriptingLayerService" />
         <service android:name=".activity.TriggerService" />
-        <service android:name="com.googlecode.android_scripting.facade.tele.InCallServiceImpl"
+        <service android:name="com.googlecode.android_scripting.facade.telephony.InCallServiceImpl"
                  android:permission="android.permission.BIND_INCALL_SERVICE" >
             <intent-filter>
                 <action android:name="android.telecom.InCallService"/>
diff --git a/sl4a/ScriptingLayerForAndroid/jni/Android.mk b/sl4a/ScriptingLayerForAndroid/jni/Android.mk
index 7a747a5..2a3c47a 100644
--- a/sl4a/ScriptingLayerForAndroid/jni/Android.mk
+++ b/sl4a/ScriptingLayerForAndroid/jni/Android.mk
@@ -1,3 +1,19 @@
+#
+#  Copyright (C) 2015 Google, Inc.
+#
+#  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.
+#
+
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
diff --git a/sl4a/ScriptingLayerForAndroid/jni/com_googlecode_android_scripting_Exec.cpp b/sl4a/ScriptingLayerForAndroid/jni/com_googlecode_android_scripting_Exec.cpp
index ee25101..2a099c8 100644
--- a/sl4a/ScriptingLayerForAndroid/jni/com_googlecode_android_scripting_Exec.cpp
+++ b/sl4a/ScriptingLayerForAndroid/jni/com_googlecode_android_scripting_Exec.cpp
@@ -1,19 +1,18 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- * Copyright (C) 2009 Google, Inc.
- *
- * 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.
- */
+//
+//  Copyright (C) 2015 Google, Inc.
+//
+//  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.
+//
 
 #include "com_googlecode_android_scripting_Exec.h"
 
diff --git a/sl4a/ScriptingLayerForAndroid/res/menu/terminal.xml b/sl4a/ScriptingLayerForAndroid/res/menu/terminal.xml
index 179b667..013b7f3 100644
--- a/sl4a/ScriptingLayerForAndroid/res/menu/terminal.xml
+++ b/sl4a/ScriptingLayerForAndroid/res/menu/terminal.xml
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-  <!--
-    * Copyright (C) 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. * 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.
-  -->
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
+-->
+
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android">
   <item
diff --git a/sl4a/ScriptingLayerForAndroid/res/values/arrays.xml b/sl4a/ScriptingLayerForAndroid/res/values/arrays.xml
index b310c75..ad2cbaf 100644
--- a/sl4a/ScriptingLayerForAndroid/res/values/arrays.xml
+++ b/sl4a/ScriptingLayerForAndroid/res/values/arrays.xml
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-  <!--
-    * Copyright (C) 2007 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.
-  -->
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
+-->
+
 <resources>
   <string-array
     name="entries_fontsize_preference">
diff --git a/sl4a/ScriptingLayerForAndroid/res/values/strings.xml b/sl4a/ScriptingLayerForAndroid/res/values/strings.xml
index 5397451..956f2e5 100644
--- a/sl4a/ScriptingLayerForAndroid/res/values/strings.xml
+++ b/sl4a/ScriptingLayerForAndroid/res/values/strings.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- * Copyright (C) 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.
- * 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.
+/*
+** Copyright 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.
+** 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.
+*/
 -->
+
 <resources>
     <string name="help_force_browser">Force API Browser</string>
    <string
diff --git a/sl4a/ScriptingLayerForAndroid/res/xml/preferences.xml b/sl4a/ScriptingLayerForAndroid/res/xml/preferences.xml
index d299149..52de1f8 100644
--- a/sl4a/ScriptingLayerForAndroid/res/xml/preferences.xml
+++ b/sl4a/ScriptingLayerForAndroid/res/xml/preferences.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
+-->
+
 <PreferenceScreen
   xmlns:android="http://schemas.android.com/apk/res/android">
   <PreferenceCategory
diff --git a/sl4a/ScriptingLayerForAndroid/res/xml/searchable_apis.xml b/sl4a/ScriptingLayerForAndroid/res/xml/searchable_apis.xml
index ae2635e..8b2ca8b 100644
--- a/sl4a/ScriptingLayerForAndroid/res/xml/searchable_apis.xml
+++ b/sl4a/ScriptingLayerForAndroid/res/xml/searchable_apis.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
+-->
+
   <searchable xmlns:android="http://schemas.android.com/apk/res/android"
         android:label="@string/application_title"
         android:hint="@string/search_description_apis"
diff --git a/sl4a/ScriptingLayerForAndroid/res/xml/searchable_scripts.xml b/sl4a/ScriptingLayerForAndroid/res/xml/searchable_scripts.xml
index f5182ce..77fa204 100644
--- a/sl4a/ScriptingLayerForAndroid/res/xml/searchable_scripts.xml
+++ b/sl4a/ScriptingLayerForAndroid/res/xml/searchable_scripts.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
+-->
+
   <searchable xmlns:android="http://schemas.android.com/apk/res/android"
         android:label="@string/application_title"
         android:hint="@string/search_description_scripts"
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/ActivityFlinger.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/ActivityFlinger.java
index 389b55e..307c8fe 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/ActivityFlinger.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/ActivityFlinger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/ScriptListAdapter.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/ScriptListAdapter.java
index a10dba5..a6c4038 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/ScriptListAdapter.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/ScriptListAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/Sl4aApplication.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/Sl4aApplication.java
index 3e7dd44..e7e7867 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/Sl4aApplication.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/Sl4aApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ApiBrowser.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ApiBrowser.java
index c254446..8deaf11 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ApiBrowser.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ApiBrowser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ApiPrompt.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ApiPrompt.java
index 6178140..385cf7e 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ApiPrompt.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ApiPrompt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/BluetoothDeviceList.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/BluetoothDeviceList.java
index 247c3d9..2d7564f 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/BluetoothDeviceList.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/BluetoothDeviceList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/CustomizeWindow.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/CustomizeWindow.java
index 4f16448..a7f7b61 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/CustomizeWindow.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/CustomizeWindow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/InterpreterManager.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/InterpreterManager.java
index 766b5cb..8544512 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/InterpreterManager.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/InterpreterManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/InterpreterPicker.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/InterpreterPicker.java
index b104af4..4985123 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/InterpreterPicker.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/InterpreterPicker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/LogcatViewer.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/LogcatViewer.java
index 0f18dec..47cca22 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/LogcatViewer.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/LogcatViewer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/Preferences.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/Preferences.java
index 4736aa2..efef53b 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/Preferences.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/Preferences.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 The Android Open Source Project
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptEditor.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptEditor.java
index 5c4b730..e5e797b 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptEditor.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
@@ -9,9 +9,9 @@
  *
  * 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.savedInstanceState See the License for the specific language
- * governing permissions and limitations under the License.
+ * 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.googlecode.android_scripting.activity;
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptManager.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptManager.java
index c45fd3b..0b9cd44 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptManager.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptPicker.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptPicker.java
index cb728a9..4e2f75d 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptPicker.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptPicker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptProcessMonitor.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptProcessMonitor.java
index 8f70a66..3f948a9 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptProcessMonitor.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptProcessMonitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptingLayerService.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptingLayerService.java
index 23b8be4..16e4fa7 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptingLayerService.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptingLayerService.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (C) 2009 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you ay not
+ * 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
  *
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptingLayerServiceLauncher.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptingLayerServiceLauncher.java
index a7e00ff..13bc933 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptingLayerServiceLauncher.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptingLayerServiceLauncher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptsLiveFolder.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptsLiveFolder.java
index 22d999c..63585e8 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptsLiveFolder.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptsLiveFolder.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.activity;
 
 import android.app.Activity;
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ServiceUtils.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ServiceUtils.java
index dc4a5b2..819e8c3 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ServiceUtils.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ServiceUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/TriggerManager.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/TriggerManager.java
index 86cde75..bd6f948 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/TriggerManager.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/TriggerManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/TriggerService.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/TriggerService.java
index a50547f..99b9978 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/TriggerService.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/TriggerService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/dialog/DurationPickerDialog.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/dialog/DurationPickerDialog.java
index d56648e..1a42c35 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/dialog/DurationPickerDialog.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/dialog/DurationPickerDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/dialog/Help.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/dialog/Help.java
index b4d6066..3a585d1 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/dialog/Help.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/dialog/Help.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/dialog/UsageTrackingConfirmation.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/dialog/UsageTrackingConfirmation.java
index d05ab4e..279238b 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/dialog/UsageTrackingConfirmation.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/dialog/UsageTrackingConfirmation.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2009 Google Inc.
- * 
+ * Copyright (C) 2015 Google Inc.
+ *
  * 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
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/locale/LocaleReceiver.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/locale/LocaleReceiver.java
index 9aa02ec..23adda8 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/locale/LocaleReceiver.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/locale/LocaleReceiver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/provider/ApiProvider.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/provider/ApiProvider.java
index 90163d6..5dd2aeb 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/provider/ApiProvider.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/provider/ApiProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/provider/ScriptProvider.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/provider/ScriptProvider.java
index 7066509..ad221f1 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/provider/ScriptProvider.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/provider/ScriptProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/provider/TelephonyTestProvider.java b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/provider/TelephonyTestProvider.java
index 79a96c8..8ff0f28 100644
--- a/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/provider/TelephonyTestProvider.java
+++ b/sl4a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/provider/TelephonyTestProvider.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.provider;
 
diff --git a/sl4a/Utils/Android.mk b/sl4a/Utils/Android.mk
index babfa3a..80e8c80 100644
--- a/sl4a/Utils/Android.mk
+++ b/sl4a/Utils/Android.mk
@@ -1,3 +1,18 @@
+#
+#  Copyright (C) 2015 Google, Inc.
+#
+#  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.
+#
 
 LOCAL_PATH := $(call my-dir)
 
diff --git a/sl4a/Utils/src/com/googlecode/android_scripting/ConvertUtils.java b/sl4a/Utils/src/com/googlecode/android_scripting/ConvertUtils.java
index c01f98d..55610e8 100644
--- a/sl4a/Utils/src/com/googlecode/android_scripting/ConvertUtils.java
+++ b/sl4a/Utils/src/com/googlecode/android_scripting/ConvertUtils.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting;
 
diff --git a/sl4a/Utils/src/com/googlecode/android_scripting/FileUtils.java b/sl4a/Utils/src/com/googlecode/android_scripting/FileUtils.java
index 429e990..b7aeb41 100644
--- a/sl4a/Utils/src/com/googlecode/android_scripting/FileUtils.java
+++ b/sl4a/Utils/src/com/googlecode/android_scripting/FileUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Utils/src/com/googlecode/android_scripting/ForegroundService.java b/sl4a/Utils/src/com/googlecode/android_scripting/ForegroundService.java
index 9e289bb..177bbb2 100644
--- a/sl4a/Utils/src/com/googlecode/android_scripting/ForegroundService.java
+++ b/sl4a/Utils/src/com/googlecode/android_scripting/ForegroundService.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting;
 
 import android.app.Notification;
diff --git a/sl4a/Utils/src/com/googlecode/android_scripting/IoUtils.java b/sl4a/Utils/src/com/googlecode/android_scripting/IoUtils.java
index 1378b00..66a4b10 100644
--- a/sl4a/Utils/src/com/googlecode/android_scripting/IoUtils.java
+++ b/sl4a/Utils/src/com/googlecode/android_scripting/IoUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Utils/src/com/googlecode/android_scripting/Log.java b/sl4a/Utils/src/com/googlecode/android_scripting/Log.java
index 06b2fa9..bb79498 100644
--- a/sl4a/Utils/src/com/googlecode/android_scripting/Log.java
+++ b/sl4a/Utils/src/com/googlecode/android_scripting/Log.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Utils/src/com/googlecode/android_scripting/MainThread.java b/sl4a/Utils/src/com/googlecode/android_scripting/MainThread.java
index 37f7233..e21154c 100644
--- a/sl4a/Utils/src/com/googlecode/android_scripting/MainThread.java
+++ b/sl4a/Utils/src/com/googlecode/android_scripting/MainThread.java
@@ -1,4 +1,18 @@
-// Copyright 2010 Google Inc. All Rights Reserved.
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting;
 
diff --git a/sl4a/Utils/src/com/googlecode/android_scripting/NotificationIdFactory.java b/sl4a/Utils/src/com/googlecode/android_scripting/NotificationIdFactory.java
index 9f49b91..14cc11e 100644
--- a/sl4a/Utils/src/com/googlecode/android_scripting/NotificationIdFactory.java
+++ b/sl4a/Utils/src/com/googlecode/android_scripting/NotificationIdFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Utils/src/com/googlecode/android_scripting/SimpleServer.java b/sl4a/Utils/src/com/googlecode/android_scripting/SimpleServer.java
index 53166b0..6fc0d87 100644
--- a/sl4a/Utils/src/com/googlecode/android_scripting/SimpleServer.java
+++ b/sl4a/Utils/src/com/googlecode/android_scripting/SimpleServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Utils/src/com/googlecode/android_scripting/SingleThreadExecutor.java b/sl4a/Utils/src/com/googlecode/android_scripting/SingleThreadExecutor.java
index fd3d044..efe6597 100644
--- a/sl4a/Utils/src/com/googlecode/android_scripting/SingleThreadExecutor.java
+++ b/sl4a/Utils/src/com/googlecode/android_scripting/SingleThreadExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Utils/src/com/googlecode/android_scripting/exception/Sl4aException.java b/sl4a/Utils/src/com/googlecode/android_scripting/exception/Sl4aException.java
index 5cab2be..6e907a1 100644
--- a/sl4a/Utils/src/com/googlecode/android_scripting/exception/Sl4aException.java
+++ b/sl4a/Utils/src/com/googlecode/android_scripting/exception/Sl4aException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Utils/src/com/googlecode/android_scripting/future/FutureResult.java b/sl4a/Utils/src/com/googlecode/android_scripting/future/FutureResult.java
index bdf9cb8..43be163 100644
--- a/sl4a/Utils/src/com/googlecode/android_scripting/future/FutureResult.java
+++ b/sl4a/Utils/src/com/googlecode/android_scripting/future/FutureResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Google Inc.
+ * Copyright (C) 2015 Google Inc.
  *
  * 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
diff --git a/sl4a/Utils/src/com/googlecode/android_scripting/interpreter/ExternalClassLoader.java b/sl4a/Utils/src/com/googlecode/android_scripting/interpreter/ExternalClassLoader.java
index 1f2caa3..ce46a20 100644
--- a/sl4a/Utils/src/com/googlecode/android_scripting/interpreter/ExternalClassLoader.java
+++ b/sl4a/Utils/src/com/googlecode/android_scripting/interpreter/ExternalClassLoader.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.googlecode.android_scripting.interpreter;
 
 import dalvik.system.DexClassLoader;
diff --git a/sl4a/Utils/src/com/googlecode/android_scripting/interpreter/InterpreterConstants.java b/sl4a/Utils/src/com/googlecode/android_scripting/interpreter/InterpreterConstants.java
index 227dd6d..36c9e89 100644
--- a/sl4a/Utils/src/com/googlecode/android_scripting/interpreter/InterpreterConstants.java
+++ b/sl4a/Utils/src/com/googlecode/android_scripting/interpreter/InterpreterConstants.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2010 Google Inc.
- * 
+ * Copyright (C) 2015 Google Inc.
+ *
  * 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
diff --git a/sl4a/Utils/src/com/googlecode/android_scripting/interpreter/InterpreterDescriptor.java b/sl4a/Utils/src/com/googlecode/android_scripting/interpreter/InterpreterDescriptor.java
index 2aedc16..58c47ae 100644
--- a/sl4a/Utils/src/com/googlecode/android_scripting/interpreter/InterpreterDescriptor.java
+++ b/sl4a/Utils/src/com/googlecode/android_scripting/interpreter/InterpreterDescriptor.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2010 Google Inc.
- * 
+ * Copyright (C) 2015 Google Inc.
+ *
  * 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
diff --git a/sl4a/Utils/src/com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.java b/sl4a/Utils/src/com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.java
index c740d71..27f9181 100644
--- a/sl4a/Utils/src/com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.java
+++ b/sl4a/Utils/src/com/googlecode/android_scripting/interpreter/InterpreterPropertyNames.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2010 Google Inc.
- * 
+ * Copyright (C) 2015 Google Inc.
+ *
  * 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
diff --git a/sl4a/Utils/src/com/googlecode/android_scripting/interpreter/InterpreterUtils.java b/sl4a/Utils/src/com/googlecode/android_scripting/interpreter/InterpreterUtils.java
index d77634b..3459fd8 100644
--- a/sl4a/Utils/src/com/googlecode/android_scripting/interpreter/InterpreterUtils.java
+++ b/sl4a/Utils/src/com/googlecode/android_scripting/interpreter/InterpreterUtils.java
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2010 Google Inc.
- * 
+ * Copyright (C) 2015 Google Inc.
+ *
  * 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
diff --git a/sl4a/Utils/src/com/trilead/ssh2/StreamGobbler.java b/sl4a/Utils/src/com/trilead/ssh2/StreamGobbler.java
index 6b2fb71..ea4714f 100644
--- a/sl4a/Utils/src/com/trilead/ssh2/StreamGobbler.java
+++ b/sl4a/Utils/src/com/trilead/ssh2/StreamGobbler.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * 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.trilead.ssh2;
 
 import com.googlecode.android_scripting.Log;
diff --git a/sl4a/android.py b/sl4a/android.py
index 7238ab1..63448a6 100644
--- a/sl4a/android.py
+++ b/sl4a/android.py
@@ -1,5 +1,5 @@
 # python3.4
-# Copyright (C) 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. You may obtain a copy of
diff --git a/sl4a/build_all.sh b/sl4a/build_all.sh
index 182de37..0b0db14 100755
--- a/sl4a/build_all.sh
+++ b/sl4a/build_all.sh
@@ -1,4 +1,21 @@
 #! /bin/bash
+
+#
+#  Copyright (C) 2015 Google, Inc.
+#
+#  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.
+#
+
 #This script does a clean build of sl4a and install it to your device through adb
 #Requires envsetup.sh in the branch
 
diff --git a/sl4a/etc/create_android_intellisence_defs.pl b/sl4a/etc/create_android_intellisence_defs.pl
deleted file mode 100644
index 9d1e0b9..0000000
--- a/sl4a/etc/create_android_intellisence_defs.pl
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/usr/bin/perl
-## Copyright (C) 2014 Google Inc.
-##
-## 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.
-#
-#
-=head
-This script parses each individual java file
-and finds each method that is prefixed by the
-line @Rpc. If the method does not have it
-then the method will be skipped. The results
-are written in defs.txt. When udpating of
-android intellisense in acts is required,
-run this scrpt then copy the results into
-the android_intellisense.py file.
-=cut
-
-use strict;
-use warnings;
-use Data::Dumper;
-use File::Find;
-$|++;
-
-my $path = '../';
-my $cmd = 'file';
-my @def_list;
-finddepth (\&wanted,$path);
-open(FILE, ">defs.txt");
-foreach (@def_list) {
-    print FILE $_ . "\n";
-}
-close(FILE);
-
-sub wanted {
-    return unless -f; #-d for dir ops or comment out for both
-    if ($_ =~ m/\.java/) {
-        parse_file_for_rpc($_);
-    }
-}
-
-sub parse_file_for_rpc {
-    my $file = shift;
-    open (FILE, $file);
-    my @lines = <FILE>;
-    close(FILE);
-    for(my $i = 0; $i < scalar(@lines); $i++) {
-        my $line = $lines[$i];
-        my $sig = "";
-        if ($line =~ m/\@Rpc\(/) {
-            my $done = 0;
-            until($done == 1) {
-                $i++;
-                $line = $lines[$i];
-                $line =~ s/^\s+//;
-                $line =~ s/\s+$//;
-                if ($line =~ m/^public/) {
-                    $sig = $line;
-                    $done =1;
-                }
-            }
-        }
-        if ($sig !~ m/public/) {
-            next;
-        }
-        my $split_sig = (split(/\(/, $sig))[0];
-        my @words = split(/\s/, $split_sig);
-        my $return_type = $words[1];
-        my $method_name = $words[$#words];
-        $method_name =~ s/\(.*$//g;
-        $method_name =~ s/\s//g;
-        my $done = 0;
-        my $unparsed_params = "";
-        until ($done == 1) {
-            if ($line =~ m/\{/) {
-                $unparsed_params = $unparsed_params . $line;
-                $done = 1;
-            } else {
-                $unparsed_params = $unparsed_params . $line;
-                $i++;
-                $line = $lines[$i];
-            }
-        }
-        my $info = (split(/$method_name/,$unparsed_params))[1];
-        $info =~ tr/ //s;
-        $info =~ s/\n//g;
-        my @tokens = split(/\s/, $info);
-        my $optional_flag = 0;
-        my $params = "";
-        my $var_flag = 0;
-        my @var_list = qw(
-        String Integer Boolean boolean int String[] JSONArray
-        Object List<String> int[] Boolean[] Short[] Character[]
-        Long[] Float[] Serializable Integer[] Byte Byte[] Double Float
-        );
-        foreach (@tokens) {
-            if ($var_flag ==1) {
-                $var_flag = 0;
-                $params = $params . $_ ;
-            }
-            elsif ($_ =~ /RpcOptional/) {
-                $optional_flag = 1;
-            }
-            elsif ($_ ~~ @var_list) {
-                if ($optional_flag == 1) {
-                    $params = $params . "Optional_";
-                    $optional_flag = 0;
-                }
-                $params = $params . $_ . "_";
-                $var_flag = 1;
-            }
-        }
-        $params=~s/\)//g;
-        $params=~s/\[\]/Array/g;
-        $params=~s/List</List/g;
-        $params=~s/>//g;
-        my $def_name = "    def $method_name (self, $params): pass";
-        push(@def_list, $def_name);
-    }
-}
-
diff --git a/sl4a/test_android.py b/sl4a/test_android.py
deleted file mode 100644
index 598f39e..0000000
--- a/sl4a/test_android.py
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/python3.4
-# vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
-
-#   Copyright 2014- 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.
-
-"""
-Unit tests for sl4a client module.
-"""
-
-
-import unittest
-
-import android
-
-class TestClass:
-    def __init__(self, v):
-        self._v = v
-
-class AndroidTests(unittest.TestCase):
-
-    def test_object_codec(self):
-        i = TestClass(1)
-        encoder = android.AndroidJSONEncoder()
-        encoder.register(TestClass)
-        j = encoder.encode(i)
-        decoder = android.AndroidJSONDecoder()
-        o = decoder.decode(j)
-        self.assertTrue(type(o) is type(i))
-
-
-
-if __name__ == "__main__":
-    unittest.main()
author	tturney <tturney@google.com>	2015-12-08 09:26:51 -0800
committer	tturney <tturney@google.com>	2015-12-08 16:24:13 -0800
commit	03ca132d84e54dad461c37c545defcdeee33edd0 (patch)
tree	22cf098b26dc403404437d172affad84e33b33fd /sl4a
parent	3046cfd6546538b494a8b0bc378c56c8a8a057af (diff)
download	platform_packages_apps_Test_connectivity-03ca132d84e54dad461c37c545defcdeee33edd0.tar.gz platform_packages_apps_Test_connectivity-03ca132d84e54dad461c37c545defcdeee33edd0.tar.bz2 platform_packages_apps_Test_connectivity-03ca132d84e54dad461c37c545defcdeee33edd0.zip