merge heads

This commit is contained in:
Jimmy Shih
2011-11-05 11:50:27 -07:00
parent 1911187450
commit 014e5257d0
6 changed files with 181 additions and 104 deletions
+2 -2
View File
@@ -248,8 +248,8 @@ limitations under the License.
<!-- Permission to get MyTracks broadcasts. For internal MyTracks communication. -->
<permission android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS"
android:permissionGroup="android.permission-group.LOCATION"
android:label="@string/mytracks_notifications_permission_label"
android:description="@string/mytracks_notifications_permission_description"
android:label="@string/notification_permission_label"
android:description="@string/notification_permission_label"
android:protectionLevel="signature" />
<!-- We read and write raw track data, obviously. -->