OSDN Git Service
Scott Main [Thu, 8 Mar 2012 01:21:50 +0000 (17:21 -0800)]
am
5e75bca9: am
99e790de: docs: add troido adk link
* commit '
5e75bca9273b9656291192e13c83799f9300d486':
docs: add troido adk link
Scott Main [Thu, 8 Mar 2012 01:19:22 +0000 (17:19 -0800)]
am
99e790de: docs: add troido adk link
* commit '
99e790de9ea23f59933fd695ca35bb6d1033b4e9':
docs: add troido adk link
Scott Main [Wed, 7 Mar 2012 00:17:08 +0000 (16:17 -0800)]
docs: add troido adk link
Change-Id: Ib7cb1dd821dc17ffc8acd02843218e6d21e15295
Roman Nurik [Tue, 6 Mar 2012 22:54:19 +0000 (14:54 -0800)]
am
ce8697f8: am
96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1
* commit '
ce8697f8d5368aa617b853fdabb6d7fb980bc5ce':
Android Git Automerger [Tue, 6 Mar 2012 22:54:13 +0000 (14:54 -0800)]
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
Roman Nurik [Tue, 6 Mar 2012 22:45:19 +0000 (14:45 -0800)]
am
c4b44be6: am
96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1
* commit '
c4b44be63d0dd315ddc499c3e939af0f4b5de594':
docs: move Android Design from static HTML to JD
Roman Nurik [Tue, 6 Mar 2012 22:43:38 +0000 (14:43 -0800)]
am
96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1
* commit '
96c757e557ed40da4400b82fd62dfbd4bc8151d1':
docs: move Android Design from static HTML to JD
Roman Nurik [Tue, 6 Mar 2012 22:42:59 +0000 (14:42 -0800)]
am
96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1
* commit '
96c757e557ed40da4400b82fd62dfbd4bc8151d1':
docs: move Android Design from static HTML to JD
Roman Nurik [Tue, 6 Mar 2012 22:39:54 +0000 (14:39 -0800)]
Merge "docs: move Android Design from static HTML to JD" into ics-mr1
Scott Main [Tue, 6 Mar 2012 22:28:44 +0000 (14:28 -0800)]
am
bf03ee12: am
66895ad5: Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1
* commit '
bf03ee12dba1504f8733297158a412b3eab40deb':
Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post.
Scott Main [Tue, 6 Mar 2012 22:28:37 +0000 (14:28 -0800)]
am
fff19ee8: am
66895ad5: Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1
* commit '
fff19ee88baff16e144d1bfc23c25a4b7f2cb191':
Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post.
Scott Main [Tue, 6 Mar 2012 22:25:27 +0000 (14:25 -0800)]
am
66895ad5: Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1
* commit '
66895ad5f7cdb9a8a292c9e6c04347a10b4212a3':
Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post.
Scott Main [Tue, 6 Mar 2012 22:24:55 +0000 (14:24 -0800)]
am
66895ad5: Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1
* commit '
66895ad5f7cdb9a8a292c9e6c04347a10b4212a3':
Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post.
Scott Main [Tue, 6 Mar 2012 22:23:23 +0000 (14:23 -0800)]
Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1
Scott Main [Tue, 6 Mar 2012 22:01:48 +0000 (14:01 -0800)]
am
f3cbcf43: am
97b94e78: docs: a few more Market -> Play strings
* commit '
f3cbcf439692b180ec5081cc68ed67c8f2a9d16d':
Scott Main [Tue, 6 Mar 2012 21:59:34 +0000 (13:59 -0800)]
am
40dbc3db: am
97b94e78: docs: a few more Market -> Play strings
* commit '
40dbc3db62006f81656043e174e9019c89686e9b':
docs: a few more Market -> Play strings
Scott Main [Tue, 6 Mar 2012 21:58:04 +0000 (13:58 -0800)]
am
97b94e78: docs: a few more Market -> Play strings
* commit '
97b94e784c012ca2bff273ff74a00c6eadd1a1a2':
docs: a few more Market -> Play strings
Scott Main [Tue, 6 Mar 2012 21:57:32 +0000 (13:57 -0800)]
am
97b94e78: docs: a few more Market -> Play strings
* commit '
97b94e784c012ca2bff273ff74a00c6eadd1a1a2':
docs: a few more Market -> Play strings
Roman Nurik [Tue, 6 Mar 2012 20:26:15 +0000 (12:26 -0800)]
docs: move Android Design from static HTML to JD
Change-Id: I6e451599998cb8b69489cada482ab5db9d71d6f8
Scott Main [Tue, 6 Mar 2012 20:10:17 +0000 (12:10 -0800)]
docs: a few more Market -> Play strings
Change-Id: Icd09ec82362ff9aac511260f0fa295ddbc7e1369
Scott Main [Tue, 6 Mar 2012 19:23:36 +0000 (11:23 -0800)]
Fix badge generator URLs and images, and update
script to generate different alt text for the different button styles.
Also change homepage announce link for blog post.
Change-Id: Ibbdc2e8abad3c218d030299eb60ba5bee75db232
Dirk Dougherty [Tue, 6 Mar 2012 17:43:18 +0000 (09:43 -0800)]
am
2ef5d3fd: am
9ad3d0ee: Update build-a-button to use new assets.
* commit '
2ef5d3fd2e4114a141676dad94f9b0352392290a':
Dirk Dougherty [Tue, 6 Mar 2012 17:40:46 +0000 (09:40 -0800)]
am
106cdc6a: am
9ad3d0ee: Update build-a-button to use new assets.
* commit '
106cdc6aba5af0d544da3042e2e8d2f8b6b1ead1':
Update build-a-button to use new assets.
Dirk Dougherty [Tue, 6 Mar 2012 17:39:02 +0000 (09:39 -0800)]
am
9ad3d0ee: Update build-a-button to use new assets.
* commit '
9ad3d0ee5bc481933a4acb10397226ffad8e03a2':
Update build-a-button to use new assets.
Dirk Dougherty [Tue, 6 Mar 2012 17:38:31 +0000 (09:38 -0800)]
am
9ad3d0ee: Update build-a-button to use new assets.
* commit '
9ad3d0ee5bc481933a4acb10397226ffad8e03a2':
Update build-a-button to use new assets.
Dirk Dougherty [Tue, 6 Mar 2012 09:48:26 +0000 (01:48 -0800)]
Update build-a-button to use new assets.
Change-Id: I2218af60519fa3adbe574aaedb1a72270ea3c1da
Pin Ting [Tue, 6 Mar 2012 09:21:27 +0000 (01:21 -0800)]
am
21b45b62: am
25c66c3a: Merge "Fix document." into ics-mr1
* commit '
21b45b624f5b5f888d0bfa89da7ecb58a0398dbe':
Android Git Automerger [Tue, 6 Mar 2012 09:21:24 +0000 (01:21 -0800)]
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
Pin Ting [Tue, 6 Mar 2012 08:59:57 +0000 (00:59 -0800)]
am
3b37fe24: am
25c66c3a: Merge "Fix document." into ics-mr1
* commit '
3b37fe24072ec4f176896e852eeca4d3a44dc05f':
Fix document.
Pin Ting [Tue, 6 Mar 2012 08:57:55 +0000 (00:57 -0800)]
am
25c66c3a: Merge "Fix document." into ics-mr1
* commit '
25c66c3a4a51617099e848a9376313c90a1ec9ae':
Fix document.
Pin Ting [Tue, 6 Mar 2012 08:57:14 +0000 (00:57 -0800)]
am
25c66c3a: Merge "Fix document." into ics-mr1
* commit '
25c66c3a4a51617099e848a9376313c90a1ec9ae':
Fix document.
Pin Ting [Tue, 6 Mar 2012 08:55:49 +0000 (00:55 -0800)]
Merge "Fix document." into ics-mr1
Scott Main [Tue, 6 Mar 2012 08:50:58 +0000 (00:50 -0800)]
am
ed9651c9: am
1c247304: docs: update homepage announcement for GP Still needs an update with proper blog link (will probably do by hand for launch push)
* commit '
ed9651c900ea2f0d67d3256080a7e7386a758d21':
docs: update homepage announcement for GP Still needs an update with proper blog link (will probably do by hand for launch push)
Scott Main [Tue, 6 Mar 2012 08:50:46 +0000 (00:50 -0800)]
am
fb825c80: am
1c247304: docs: update homepage announcement for GP Still needs an update with proper blog link (will probably do by hand for launch push)
* commit '
fb825c80ac0170fc2e5996a4fbc8f5bc8563ccae':
docs: update homepage announcement for GP Still needs an update with proper blog link (will probably do by hand for launch push)
Scott Main [Tue, 6 Mar 2012 08:48:44 +0000 (00:48 -0800)]
am
1c247304: docs: update homepage announcement for GP Still needs an update with proper blog link (will probably do by hand for launch push)
* commit '
1c2473042236dd63774d7a2c5edfd991b4ef1b3e':
docs: update homepage announcement for GP Still needs an update with proper blog link (will probably do by hand for launch push)
Scott Main [Tue, 6 Mar 2012 08:48:08 +0000 (00:48 -0800)]
am
1c247304: docs: update homepage announcement for GP Still needs an update with proper blog link (will probably do by hand for launch push)
* commit '
1c2473042236dd63774d7a2c5edfd991b4ef1b3e':
docs: update homepage announcement for GP Still needs an update with proper blog link (will probably do by hand for launch push)
Pin Ting [Fri, 2 Mar 2012 16:13:32 +0000 (00:13 +0800)]
Fix document.
Change-Id: I661b259c8438f9290d57fae29a828cf4495ce335
Scott Main [Fri, 2 Mar 2012 23:49:34 +0000 (15:49 -0800)]
docs: update homepage announcement for GP
Still needs an update with proper blog link
(will probably do by hand for launch push)
Change-Id: I660082780ffd27cf591351e6b65be61a109a6d5d
Dirk Dougherty [Tue, 6 Mar 2012 07:15:38 +0000 (23:15 -0800)]
am
859717ad: am
4d7bc655: Doc change: String changes for Android Market
* commit '
859717ad627374c6e6ceae9f7cccf73084cb5fae':
Dirk Dougherty [Tue, 6 Mar 2012 07:14:22 +0000 (23:14 -0800)]
am
56bab8bd: am
4d7bc655: Doc change: String changes for Android Market
* commit '
56bab8bd83c4f54f876fdd76fc241197920129db':
Doc change: String changes for Android Market
Dirk Dougherty [Tue, 6 Mar 2012 06:55:49 +0000 (22:55 -0800)]
am
4d7bc655: Doc change: String changes for Android Market
* commit '
4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219':
Doc change: String changes for Android Market
Dirk Dougherty [Tue, 6 Mar 2012 06:55:34 +0000 (22:55 -0800)]
am
4d7bc655: Doc change: String changes for Android Market
* commit '
4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219':
Doc change: String changes for Android Market
Dirk Dougherty [Sat, 28 Jan 2012 01:56:49 +0000 (17:56 -0800)]
Doc change: String changes for Android Market
Change-Id: I823812a4fd24021bec906ad856479c92a8d2a759
Scott Main [Tue, 6 Mar 2012 04:23:33 +0000 (20:23 -0800)]
Scott Main [Tue, 6 Mar 2012 04:21:48 +0000 (20:21 -0800)]
am
5ab7b3d1: am
e606cb46: docs: fix api dashboard
* commit '
5ab7b3d111feb28def87b3ed40b3e877c5f977e2':
docs: fix api dashboard
Scott Main [Tue, 6 Mar 2012 04:20:18 +0000 (20:20 -0800)]
am
e606cb46: docs: fix api dashboard
* commit '
e606cb460272cd99bac05b4477a5e489827b368b':
docs: fix api dashboard
Scott Main [Tue, 6 Mar 2012 04:19:53 +0000 (20:19 -0800)]
am
e606cb46: docs: fix api dashboard
* commit '
e606cb460272cd99bac05b4477a5e489827b368b':
docs: fix api dashboard
Scott Main [Tue, 6 Mar 2012 04:14:16 +0000 (20:14 -0800)]
docs: fix api dashboard
Change-Id: Ifbd596860f3368811e31494176682571be919459
Scott Main [Tue, 6 Mar 2012 01:44:22 +0000 (17:44 -0800)]
am
b7ffa62c: am
290684ac: docs: fix expansion library package name
* commit '
b7ffa62c6b0e5dd8850933ed6c60698c5f4ca109':
Scott Main [Tue, 6 Mar 2012 01:43:04 +0000 (17:43 -0800)]
am
1054c676: am
290684ac: docs: fix expansion library package name
* commit '
1054c676ff7f7742b5b1cfafaaf9cb198fd291f1':
docs: fix expansion library package name
Scott Main [Tue, 6 Mar 2012 01:40:43 +0000 (17:40 -0800)]
am
290684ac: docs: fix expansion library package name
* commit '
290684ac2eadf786d2f478d3d280eb3058627789':
docs: fix expansion library package name
Scott Main [Tue, 6 Mar 2012 01:40:27 +0000 (17:40 -0800)]
am
290684ac: docs: fix expansion library package name
* commit '
290684ac2eadf786d2f478d3d280eb3058627789':
docs: fix expansion library package name
Scott Main [Tue, 6 Mar 2012 01:35:36 +0000 (17:35 -0800)]
docs: fix expansion library package name
Change-Id: I38303b5650fd924ac25281baf4a7da51aa939394
Scott Main [Mon, 5 Mar 2012 22:53:02 +0000 (14:53 -0800)]
am
a216ff33: am
a47d88a7: docs: dashboard update for march 5
* commit '
a216ff330bd1e869939ef0ed7b400f76564b2793':
Andrew Flynn [Thu, 23 Feb 2012 23:45:06 +0000 (15:45 -0800)]
DO NOT MERGE Return 1.5 * density as default for large screens.
Change-Id: Ib2d390803f08812636364ceb3849eddf80044072
Ramanan Rajeswaran [Mon, 13 Feb 2012 21:53:39 +0000 (13:53 -0800)]
DO NOT MERGE
Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."
This reverts commit
c1496d2d9a496e4aba817a58ecb9e07fe55cdba5.
Change-Id: If60df742b19c925cc99b20d01108b84415b124ad
Dianne Hackborn [Wed, 25 Jan 2012 23:12:23 +0000 (15:12 -0800)]
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
Ramanan Rajeswaran [Mon, 13 Feb 2012 21:53:39 +0000 (13:53 -0800)]
DO NOT MERGE
Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."
This reverts commit
c1496d2d9a496e4aba817a58ecb9e07fe55cdba5.
Change-Id: If60df742b19c925cc99b20d01108b84415b124ad
Dianne Hackborn [Wed, 25 Jan 2012 23:12:23 +0000 (15:12 -0800)]
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
Scott Main [Mon, 5 Mar 2012 22:39:46 +0000 (14:39 -0800)]
am
8b0f6881: am
a47d88a7: docs: dashboard update for march 5
* commit '
8b0f688156919cec527bc60df43c527d2dd940dc':
docs: dashboard update for march 5
Scott Main [Mon, 5 Mar 2012 22:36:47 +0000 (14:36 -0800)]
am
a47d88a7: docs: dashboard update for march 5
* commit '
a47d88a7d25da74319dc3decf80d98516a85fab2':
docs: dashboard update for march 5
Scott Main [Mon, 5 Mar 2012 22:36:05 +0000 (14:36 -0800)]
am
a47d88a7: docs: dashboard update for march 5
* commit '
a47d88a7d25da74319dc3decf80d98516a85fab2':
docs: dashboard update for march 5
Scott Main [Mon, 5 Mar 2012 22:21:24 +0000 (14:21 -0800)]
docs: dashboard update for march 5
Change-Id: Ic71a478ad8afd818dfe9c0a2341e1d1937be5444
Scott Main [Mon, 5 Mar 2012 21:32:20 +0000 (13:32 -0800)]
am
afdf856d: am
2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
* commit '
afdf856d432fe5bae56152e42cb2c28ba63a5af0':
Scott Main [Mon, 5 Mar 2012 21:27:33 +0000 (13:27 -0800)]
am
97aa69d3: am
2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
* commit '
97aa69d32f52499db001970829a0e654564ea551':
docs: add note about declaring file sizes with sample app's code
Scott Main [Mon, 5 Mar 2012 21:26:26 +0000 (13:26 -0800)]
am
2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
* commit '
2df6ecc508f6b30fd5d005394effa64272584caa':
docs: add note about declaring file sizes with sample app's code
Scott Main [Mon, 5 Mar 2012 21:25:54 +0000 (13:25 -0800)]
am
2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
* commit '
2df6ecc508f6b30fd5d005394effa64272584caa':
docs: add note about declaring file sizes with sample app's code
Scott Main [Mon, 5 Mar 2012 21:22:56 +0000 (13:22 -0800)]
docs: add note about declaring file sizes with sample app's code
Change-Id: I7858956916c0db5a585228a890a20fb004155b8c
Scott Main [Mon, 5 Mar 2012 19:56:48 +0000 (11:56 -0800)]
am
a7368087: am
6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
* commit '
a7368087d6f1f2682174139d9cacab48dc7bc198':
Scott Main [Mon, 5 Mar 2012 19:54:36 +0000 (11:54 -0800)]
am
6d2a18b5: am
6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
* commit '
6d2a18b51ee7f7f3aad0b7b76ab55a90900f9403':
docs: updates to OBB guide for naming; plus other edits
Scott Main [Mon, 5 Mar 2012 19:52:59 +0000 (11:52 -0800)]
am
6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
* commit '
6f63d6fc044f259b7c796e7b7e8c5c8e4a3a3aed':
docs: updates to OBB guide for naming; plus other edits
Scott Main [Mon, 5 Mar 2012 19:52:41 +0000 (11:52 -0800)]
am
6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
* commit '
6f63d6fc044f259b7c796e7b7e8c5c8e4a3a3aed':
docs: updates to OBB guide for naming; plus other edits
Scott Main [Mon, 5 Mar 2012 19:51:03 +0000 (11:51 -0800)]
Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
Scott Main [Mon, 5 Mar 2012 18:56:39 +0000 (10:56 -0800)]
docs: updates to OBB guide for naming; plus other edits
Change-Id: I0a3afa0388f89d7464471917fec7d767748a870e
Scott Main [Mon, 5 Mar 2012 18:08:54 +0000 (10:08 -0800)]
am
bde31762: am
93dc642e: docs: fix misc bugs from external tracker
* commit '
bde31762f989acbfde92e8f47ceea780cacc4e7a':
Scott Main [Mon, 5 Mar 2012 18:07:47 +0000 (10:07 -0800)]
am
08e91352: am
93dc642e: docs: fix misc bugs from external tracker
* commit '
08e91352169457ac86a2465e4db867971ce14b10':
docs: fix misc bugs from external tracker
Scott Main [Mon, 5 Mar 2012 18:06:04 +0000 (10:06 -0800)]
am
93dc642e: docs: fix misc bugs from external tracker
* commit '
93dc642eaf48e3db58c4929df26283fbc5fd663f':
docs: fix misc bugs from external tracker
Scott Main [Mon, 5 Mar 2012 18:06:00 +0000 (10:06 -0800)]
am
93dc642e: docs: fix misc bugs from external tracker
* commit '
93dc642eaf48e3db58c4929df26283fbc5fd663f':
docs: fix misc bugs from external tracker
Scott Main [Fri, 24 Feb 2012 20:04:06 +0000 (12:04 -0800)]
docs: fix misc bugs from external tracker
Change-Id: I2be617be23d0ac50baabac561d510633fa9f162a
The Android Open Source Project [Sat, 3 Mar 2012 00:48:24 +0000 (16:48 -0800)]
am
37d6d98f: Reconcile with ics-mr1-release
* commit '
37d6d98fe3ea739627e03b78196faba55b427503':
Scott Main [Sat, 3 Mar 2012 00:44:21 +0000 (16:44 -0800)]
am
cc902c78: am
4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
* commit '
cc902c78e41549749ad98d96530bef25a3aeae47':
The Android Open Source Project [Sat, 3 Mar 2012 00:43:42 +0000 (16:43 -0800)]
Reconcile with ics-mr1-release
Change-Id: I8794fd70cb0e38d3c7893b782afdde0acfcffceb
Scott Main [Sat, 3 Mar 2012 00:42:36 +0000 (16:42 -0800)]
am
9ad705ce: am
4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
* commit '
9ad705ce0b8271931f9a09d181069c7466afade4':
docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
Scott Main [Sat, 3 Mar 2012 00:40:21 +0000 (16:40 -0800)]
am
4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
* commit '
4143781cdea0741ce6e87967c4ab903288c3e4c3':
docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
Scott Main [Sat, 3 Mar 2012 00:40:00 +0000 (16:40 -0800)]
am
4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
* commit '
4143781cdea0741ce6e87967c4ab903288c3e4c3':
docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
The Android Open Source Project [Sat, 3 Mar 2012 00:35:27 +0000 (16:35 -0800)]
am
3e72c93b: Reconcile with ics-mr1-release
* commit '
3e72c93b1652ec021fa0965e432b508b847b2b74':
The Android Open Source Project [Sat, 3 Mar 2012 00:32:56 +0000 (16:32 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ia054839cf72145c96864f64012bf980e146b1b1a
Scott Main [Thu, 7 Jul 2011 21:51:56 +0000 (14:51 -0700)]
docs: add docs for market OBB
includes splitting the Licensing dev guide into multiple pages;
Turned original licensing doc into a redirect to the new
files that are under guide/market/licensing/;
Fix all links pointing to app licensing
Change-Id: Ic49493f0e560db225dd7a382ffabc904a2fa1228
The Android Automerger [Fri, 2 Mar 2012 19:51:23 +0000 (11:51 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Robert Ly [Fri, 2 Mar 2012 17:10:22 +0000 (09:10 -0800)]
Robert Ly [Fri, 2 Mar 2012 17:09:30 +0000 (09:09 -0800)]
am
67a15457: am
e5e11fd6: Merge "docs: fixing bug
5942573" into ics-mr1
* commit '
67a15457d184f01fffe162a0983d0b507cb7b358':
docs: fixing bug
5942573
Robert Ly [Fri, 2 Mar 2012 17:06:44 +0000 (09:06 -0800)]
am
e5e11fd6: Merge "docs: fixing bug
5942573" into ics-mr1
* commit '
e5e11fd666d242b099466017c6d9bd23e6d2896d':
docs: fixing bug
5942573
Robert Ly [Fri, 2 Mar 2012 17:06:44 +0000 (09:06 -0800)]
am
e5e11fd6: Merge "docs: fixing bug
5942573" into ics-mr1
* commit '
e5e11fd666d242b099466017c6d9bd23e6d2896d':
docs: fixing bug
5942573
Robert Ly [Fri, 2 Mar 2012 17:04:16 +0000 (09:04 -0800)]
Merge "docs: fixing bug
5942573" into ics-mr1
Dianne Hackborn [Fri, 2 Mar 2012 16:37:48 +0000 (08:37 -0800)]
am
921e8303: am
0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1
* commit '
921e83039d266b6d288fd5e09160d878eccb9e23':
Dianne Hackborn [Fri, 2 Mar 2012 16:36:05 +0000 (08:36 -0800)]
am
f65951bf: am
0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1
* commit '
f65951bf5db7a248651cbfa89886d773f95c3e03':
Make ResolverActivity update dynamically.
Dianne Hackborn [Fri, 2 Mar 2012 16:33:22 +0000 (08:33 -0800)]
am
0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1
* commit '
0dd9ec144b0da8df9d8900d78c8177e761de458d':
Make ResolverActivity update dynamically.
Dianne Hackborn [Fri, 2 Mar 2012 16:33:21 +0000 (08:33 -0800)]
am
0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1
* commit '
0dd9ec144b0da8df9d8900d78c8177e761de458d':
Make ResolverActivity update dynamically.
Dianne Hackborn [Fri, 2 Mar 2012 16:30:36 +0000 (08:30 -0800)]
Merge "Make ResolverActivity update dynamically." into ics-mr1
Adam Powell [Fri, 2 Mar 2012 06:52:39 +0000 (22:52 -0800)]
am
25517fdc: am
637c50db: am
c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)"
* commit '
25517fdc53018ef676a1d340e2d5cbd780e5dc8b':
Fix dividers for LinearLayout (TabWidget)
OSDN Git Service
