LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'b1637825' into manualmerge

Browse Source 
Conflicts:
	scripts/app_engine_server/redirects.yaml

Change-Id: If68fc5e8461f3f9d63d00cc251e4bed2531d7025
This commit is contained in:
Dirk Dougherty
2013-06-26 10:58:30 -07:00
parent af5f663ae0 b1637825c1
commit 90b9ab16f9
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/app_engine_server/redirects.yaml
View File

@@ -655,18 +655,22 @@ redirects:
dst: http://www.youtube.com/user/androiddevelopers dst: http://www.youtube.com/user/androiddevelopers
type: permanent type: permanent
- src: /playbadge - src: /playbadge/?$
dst: http://developer.android.com/distribute/googleplay/promote/badges.html dst: http://developer.android.com/distribute/googleplay/promote/badges.html
type: permanent type: permanent
- src: /deviceart - src: /deviceart/?$
dst: http://developer.android.com/distribute/promote/device-art.html dst: http://developer.android.com/distribute/promote/device-art.html
type: permanent type: permanent
- src: /edu/signup/?$
dst: https://services.google.com/fb/forms/playedu
type: permanent
- src: /edu/?$
dst: /distribute/googleplay/edu/index.html
type: permanent
- src: /edu/signup - src: /edu/signup
dst: https://services.google.com/fb/forms/playedu dst: https://services.google.com/fb/forms/playedu
type: permanent type: permanent
- src: /edu
dst: /distribute/googleplay/edu/index.html
type: permanent