Updated copyright and license information.

PaymentOneAPK/License.txt

@@ -1,21 +1,24 @@
-Copyright © 2014 Nokia Corporation. All rights reserved.
+Copyright © 2014 Microsoft Mobile Oy. All rights reserved.
+
+Microsoft is a registered trademark of Microsoft Corporation. Nokia and HERE are
+trademarks and/or registered trademarks of Nokia Corporation. Other product and
+company names mentioned herein may be trademarks or trade names of their
+respective owners.
 
-Nokia, Nokia Developer, and HERE are trademarks and/or registered trademarks of
-Nokia Corporation. Other product and company names mentioned herein may be
-trademarks or trade names of their respective owners.
 
 License
+
 Subject to the conditions below, you may use, copy, modify and/or merge copies
-of this software and associated content and documentation files (the “Software”)
+of this software and associated content and documentation files (the ”Software”)
 to test, develop, publish, distribute, sub-license and/or sell new software
-derived from or incorporating the Software, solely in connection with Nokia
-devices. Some of the documentation, content and/or software maybe licensed under
-open source software or other licenses. To the extent such documentation,
-content and/or software are included, licenses and/or other terms and conditions
-shall apply in addition and/or instead of this notice. The exact terms of the
-licenses, disclaimers, acknowledgements and notices are reproduced in the
-materials provided, or in other obvious locations. No other license to any other
-intellectual property rights is granted herein.
+derived from or incorporating the Software, solely in connection with Microsoft
+Mobile devices (however branded). Some of the documentation, content and/or
+software may be licensed under open source software or other licenses. To the
+extent such documentation, content and/or software are included, those licenses
+and/or other terms and conditions shall apply in addition and/or instead of this
+notice. The exact terms of the licenses, disclaimers, acknowledgements and
+notices are reproduced in the materials provided, or in other obvious locations.
+No other license to any other intellectual property rights is granted herein.
 
 This file, unmodified, shall be included with all copies or substantial portions
 of the Software that are distributed in source code form.
@@ -26,7 +29,9 @@ from or incorporating the Software.
 Any person dealing with the Software shall not misrepresent the source of the
 Software.
 
+
 Disclaimer
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 FOR A PARTICULAR PURPOSE, QUALITY AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -36,5 +41,5 @@ EXEMPLARY AND/ OR INCIDENTAL DAMAGES) OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-Nokia Corporation retains the right to make changes to this document at any
+Microsoft Mobile Oy retains the right to make changes to this document at any
 time, without notice.

PaymentOneAPK/res/layout/main.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+    Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
     See the license text file delivered with this project for more information.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

PaymentOneAPK/res/values/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+    Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
     See the license text file delivered with this project for more information.
 -->
 <resources>

PaymentOneAPK/src/com/nokia/example/paymentoneapk/PaymentOneAPKActivity.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
  * See the license text file delivered with this project for more information.
  */
 

PaymentOneAPK/src/com/nokia/example/paymentoneapk/PaymentOneAPKService.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
  * See the license text file delivered with this project for more information.
  */
 

PaymentOneAPK/src/com/nokia/payment/iap/aidl/INokiaIAPService.aidl

@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2013 Nokia Corporation. All rights reserved.
+Copyright (c) 2013-2014 Microsoft Mobile. All rights reserved.
 *
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

PepperFarmSimulator/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+    Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
     See the license text file delivered with this project for more information.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"

PepperFarmSimulator/license.txt

@@ -1,21 +1,24 @@
-Copyright © 2014 Nokia Corporation. All rights reserved.
+Copyright © 2014 Microsoft Mobile Oy. All rights reserved.
+
+Microsoft is a registered trademark of Microsoft Corporation. Nokia and HERE are
+trademarks and/or registered trademarks of Nokia Corporation. Other product and
+company names mentioned herein may be trademarks or trade names of their
+respective owners.
 
-Nokia, Nokia Developer, and HERE are trademarks and/or registered trademarks of
-Nokia Corporation. Other product and company names mentioned herein may be
-trademarks or trade names of their respective owners.
 
 License
+
 Subject to the conditions below, you may use, copy, modify and/or merge copies
-of this software and associated content and documentation files (the “Software”)
+of this software and associated content and documentation files (the ”Software”)
 to test, develop, publish, distribute, sub-license and/or sell new software
-derived from or incorporating the Software, solely in connection with Nokia
-devices. Some of the documentation, content and/or software maybe licensed under
-open source software or other licenses. To the extent such documentation,
-content and/or software are included, licenses and/or other terms and conditions
-shall apply in addition and/or instead of this notice. The exact terms of the
-licenses, disclaimers, acknowledgements and notices are reproduced in the
-materials provided, or in other obvious locations. No other license to any other
-intellectual property rights is granted herein.
+derived from or incorporating the Software, solely in connection with Microsoft
+Mobile devices (however branded). Some of the documentation, content and/or
+software may be licensed under open source software or other licenses. To the
+extent such documentation, content and/or software are included, those licenses
+and/or other terms and conditions shall apply in addition and/or instead of this
+notice. The exact terms of the licenses, disclaimers, acknowledgements and
+notices are reproduced in the materials provided, or in other obvious locations.
+No other license to any other intellectual property rights is granted herein.
 
 This file, unmodified, shall be included with all copies or substantial portions
 of the Software that are distributed in source code form.
@@ -26,7 +29,9 @@ from or incorporating the Software.
 Any person dealing with the Software shall not misrepresent the source of the
 Software.
 
+
 Disclaimer
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 FOR A PARTICULAR PURPOSE, QUALITY AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -36,5 +41,5 @@ EXEMPLARY AND/ OR INCIDENTAL DAMAGES) OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-Nokia Corporation retains the right to make changes to this document at any
+Microsoft Mobile Oy retains the right to make changes to this document at any
 time, without notice.

PepperFarmSimulator/res/layout/activity_product_list.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+    Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
     See the license text file delivered with this project for more information.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

PepperFarmSimulator/res/layout/activity_product_list_row_view.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+    Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
     See the license text file delivered with this project for more information.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

PepperFarmSimulator/res/layout/main_screen_pepper_list_fragment.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+    Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
     See the license text file delivered with this project for more information.
 -->
  <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

PepperFarmSimulator/res/layout/pepper_farm_main_view.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+    Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
     See the license text file delivered with this project for more information.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

PepperFarmSimulator/res/layout/pepper_farm_splash_screen.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+    Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
     See the license text file delivered with this project for more information.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

PepperFarmSimulator/res/layout/pepper_list_row_view.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+    Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
     See the license text file delivered with this project for more information.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

PepperFarmSimulator/res/values/dimens.xml

@@ -1,5 +1,5 @@
 <!--
-    Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+    Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
     See the license text file delivered with this project for more information.
 -->
 <resources>

PepperFarmSimulator/res/values/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+    Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
     See the license text file delivered with this project for more information.
 -->
 <resources>

PepperFarmSimulator/res/values/styles.xml

@@ -1,5 +1,5 @@
 <!--
-    Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+    Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
     See the license text file delivered with this project for more information.
 -->
 <resources>

PepperFarmSimulator/src/com/nokia/example/pepperfarm/client/MainScreenPepperListFragment.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
  * See the license text file delivered with this project for more information.
  */
 

PepperFarmSimulator/src/com/nokia/example/pepperfarm/client/PepperFarmMainScreenActivity.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
  * See the license text file delivered with this project for more information.
  */
 

PepperFarmSimulator/src/com/nokia/example/pepperfarm/client/PepperFarmSplashScreen.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
  * See the license text file delivered with this project for more information.
  */
 

PepperFarmSimulator/src/com/nokia/example/pepperfarm/client/Pepperfarm.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
  * See the license text file delivered with this project for more information.
  */
 

PepperFarmSimulator/src/com/nokia/example/pepperfarm/client/ProductListActivity.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
  * See the license text file delivered with this project for more information.
  */
 

PepperFarmSimulator/src/com/nokia/example/pepperfarm/client/ProductListFragment.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
  * See the license text file delivered with this project for more information.
  */
 

PepperFarmSimulator/src/com/nokia/example/pepperfarm/client/util/ProductDetails.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
  * See the license text file delivered with this project for more information.
  */
 

PepperFarmSimulator/src/com/nokia/example/pepperfarm/client/util/Purchase.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
  * See the license text file delivered with this project for more information.
  */
 

PepperFarmSimulator/src/com/nokia/example/pepperfarm/iap/Payment.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
  * See the license text file delivered with this project for more information.
  */
 

PepperFarmSimulator/src/com/nokia/example/pepperfarm/product/Config.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
  * See the license text file delivered with this project for more information.
  */
 

PepperFarmSimulator/src/com/nokia/example/pepperfarm/product/Content.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
  * See the license text file delivered with this project for more information.
  */
 

PepperFarmSimulator/src/com/nokia/example/pepperfarm/product/adapters/ContentListAdapter.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
  * See the license text file delivered with this project for more information.
  */
 

PepperFarmSimulator/src/com/nokia/example/pepperfarm/product/adapters/ContentPurchaseAdapter.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
  * See the license text file delivered with this project for more information.
  */
 

PepperFarmSimulator/src/com/nokia/payment/iap/aidl/INokiaIAPService.aidl

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2014 Microsoft Mobile and/or its subsidiary(-ies).
  * All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");