| OLD | NEW |
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <!-- | 2 <!-- |
| 3 Copyright 2015 Google Inc. All Rights Reserved. | 3 Copyright 2015 Google Inc. All Rights Reserved. |
| 4 | 4 |
| 5 Licensed under the Apache License, Version 2.0 (the "License"); | 5 Licensed under the Apache License, Version 2.0 (the "License"); |
| 6 you may not use this file except in compliance with the License. | 6 you may not use this file except in compliance with the License. |
| 7 You may obtain a copy of the License at | 7 You may obtain a copy of the License at |
| 8 | 8 |
| 9 http://www.apache.org/licenses/LICENSE-2.0 | 9 http://www.apache.org/licenses/LICENSE-2.0 |
| 10 | 10 |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 android:value=".DemoListActivity" /> | 64 android:value=".DemoListActivity" /> |
| 65 </activity> | 65 </activity> |
| 66 <activity | 66 <activity |
| 67 android:name=".ServiceConnectionActivity" | 67 android:name=".ServiceConnectionActivity" |
| 68 android:label="@string/title_activity_service_connection" | 68 android:label="@string/title_activity_service_connection" |
| 69 android:parentActivityName=".DemoListActivity" > | 69 android:parentActivityName=".DemoListActivity" > |
| 70 <meta-data | 70 <meta-data |
| 71 android:name="android.support.PARENT_ACTIVITY" | 71 android:name="android.support.PARENT_ACTIVITY" |
| 72 android:value=".DemoListActivity" /> | 72 android:value=".DemoListActivity" /> |
| 73 </activity> | 73 </activity> |
| 74 <receiver android:name=".ShareBroadcastReceiver" /> | 74 <receiver android:name=".ActionBroadcastReceiver" /> |
| 75 </application> | 75 </application> |
| 76 | 76 |
| 77 </manifest> | 77 </manifest> |
| OLD | NEW |