87802 Commits

Author SHA1 Message Date
Baligh Uddin
36c7d313af Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-11-15 08:02:17 -08:00
Scott Main
0034beab72 resolved conflicts for merge of 783e115b to jb-mr1-dev
Change-Id: Ibfd3023a845fb6cc549f05bcff2d6e4abc7e5a07
2012-11-14 19:10:18 -08:00
Scott Main
783e115b60 resolved conflicts for merge of e907a390 to jb-dev-plus-aosp
Change-Id: I4e216b81f33b4b7c238f74f1c475bc84df3f79ef
2012-11-14 19:04:05 -08:00
&& repo sync -j8
1019a9c44e Doc Update: Fixing images
Bug: 7542170
Change-Id: I18e5d360e21af9d30864456ae429b804314e1edb
2012-11-14 18:27:36 -08:00
&& repo sync -j8
91cd7a7d52 Doc Update: Removed "no guaranteed delivery" line.
Change-Id: I6f5b80d263069752b7d47b5825ff024b1858e41e
2012-11-14 18:15:53 -08:00
Scott Main
e907a3909d am 22cc2764: implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the lis
* commit '22cc2764cc74e52888b043e0c6371594305bb5e9':
  implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the list of classes/lessons on each course landing page.
2012-11-14 17:38:15 -08:00
Scott Main
22cc2764cc implement new organization for Training classes
This also moves a few of the documents from API Guides > Best Practices
into the new courses for best practices.
This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d
which generates the list of classes/lessons on each course landing page.

Change-Id: I8132f72f78d844c3b035c7aa269ad3b88a25d02a
2012-11-14 17:30:24 -08:00
Joe Fernandez
e3be79be3f Merge "docs: Added note on MIPS system image additions" into jb-mr1-dev 2012-11-14 16:57:30 -08:00
Scott Main
8680f8ff6d Merge "docs: add warning for adt bundle on 32-bit os" into jb-mr1-dev 2012-11-14 15:10:18 -08:00
Scott Main
226fe97155 docs: add warning for adt bundle on 32-bit os
Change-Id: I0a2a62f66e64290006d67b9509b4223588d654b7
2012-11-14 15:09:45 -08:00
Quddus Chong
73b1f68e3c Merge "docs: Updated uiautomator API docs to reflect correct API level. bug: 7538348" into jb-mr1-dev 2012-11-14 13:08:26 -08:00
Quddus Chong
8fcab20dfd docs: Updated uiautomator API docs to reflect correct API level.
bug: 7538348

Change-Id: I03cdc53096a87e79ed8d4584dd0f726e8337c2a2
2012-11-14 11:53:34 -08:00
Joe Fernandez
3d4f229172 docs: Added note on MIPS system image additions
Change-Id: I21e79563ea92358f274c90d3495439182aa4450e
2012-11-14 11:37:34 -08:00
Roman Nurik
6ed4801519 Merge "docs: Update Nexus 10 device frames for darker, more accurate bezel rendering." into jb-mr1-dev 2012-11-14 11:34:03 -08:00
Roman Nurik
2a45c152bd docs: Update Nexus 10 device frames for darker, more accurate bezel rendering.
Change-Id: Id0a17f187c4ca3c24295257b0c5ca653d1c8cd4d
2012-11-14 10:49:08 -08:00
Baligh Uddin
dd0ffba856 Import translations. DO NOT MERGE
Change-Id: I28291cc43ab74267b771dacf7dc570447a4a3dcf
Auto-generated-cl: translation import
2012-11-14 10:39:26 -08:00
Baligh Uddin
2303f4242f Import translations. DO NOT MERGE
Change-Id: I44ee12f2a6399347b884f91259117be4774b964b
Auto-generated-cl: translation import
2012-11-14 10:11:28 -08:00
Joe Malin
4422596ddb am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit 'ce37f1da3619dcb4e53ca014cf4a17885cc3af0f':
  Notification.java javadoc: addAction
2012-11-13 14:25:09 -08:00
Joe Malin
ce37f1da36 am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit '4979a0b59486d737a4d9267af9b38f237705e26f':
  Notification.java javadoc: addAction
2012-11-13 14:22:58 -08:00
Joe Malin
4979a0b594 am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit '5f32d3375b13e581d3101ed8e928fd6a463f3809':
  Notification.java javadoc: addAction
2012-11-13 14:20:54 -08:00
Joe Malin
5f32d3375b Merge "Notification.java javadoc: addAction" into jb-dev-docs 2012-11-13 14:14:23 -08:00
Joe Fernandez
9b703463eb Merge "docs: Update platform version page with 4.2 release" into jb-mr1-dev 2012-11-13 13:36:01 -08:00
Joe Fernandez
3bdf4b6ca5 docs: Update platform version page with 4.2 release
Change-Id: I98f8090a8cf8100584a428c407374d7188d1f42b
2012-11-13 12:31:57 -08:00
Scott Main
f20b146fff Merge "docs: add ndk tos wall" into jb-mr1-dev 2012-11-13 11:41:14 -08:00
Scott Main
66e642b6d0 docs: add ndk tos wall
Change-Id: Ic7338d7d3606a017c84ce9895dfe68f2b931d182
2012-11-13 11:24:35 -08:00
Dirk Dougherty
c178ebe719 Merge "Doc change: update image for landing page." into jb-mr1-dev 2012-11-13 09:23:50 -08:00
Dirk Dougherty
b5e15cab4b Doc change: update image for landing page.
Change-Id: I8e88b3972c5597e0510b94938572b7219eecba46
2012-11-13 09:21:00 -08:00
Scott Main
bd2b531359 Merge "docs: edits" into jb-mr1-dev 2012-11-13 09:10:21 -08:00
Scott Main
ca211c7429 docs: edits
Change-Id: I6a9f22100a138c594993cd9e0c1edfe0bb33affa
2012-11-13 09:08:42 -08:00
Baligh Uddin
9508e31dcd Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-11-13 08:50:51 -08:00
Scott Main
574c2cbfb6 Merge "docs: add templated tabs for jb highlights" into jb-mr1-dev 2012-11-13 07:42:57 -08:00
Scott Main
5617b06917 docs: add templated tabs for jb highlights
Change-Id: I2353ec2bf96b5c0da46a2803639ef607fd12e167
2012-11-13 07:39:35 -08:00
Dirk Dougherty
64b12118ba Doc change: edits and landing page.
Change-Id: Id79387c68771452dc091bbb2f8a576f33ecef68e
2012-11-13 07:14:12 -08:00
Dirk Dougherty
b4d28dbf77 Merge "Doc change: image optimizations for docs." into jb-mr1-dev 2012-11-13 06:53:15 -08:00
Scott Main
5878e2b329 Merge "docs: fix bug with unknown anchors" into jb-mr1-dev 2012-11-13 05:59:17 -08:00
Scott Main
3a535a47c3 docs: fix bug with unknown anchors
Change-Id: I70f978ffd2248973a43ff1fe1dec2b0ac78cb63b
2012-11-13 05:58:23 -08:00
Dirk Dougherty
5ac04f38a0 Doc change: image optimizations for docs.
Change-Id: I33fbdcf11ec7cd6140d287184392866926f05551
2012-11-13 05:37:11 -08:00
Scott Main
2c7e6cb773 Merge "docs: add tabs to JB highlights" into jb-mr1-dev 2012-11-13 05:34:05 -08:00
Scott Main
0d881cb58c docs: add tabs to JB highlights
Change-Id: Ia8e04f54678ea51a8ca50bf3b51f9a6cfd86d2da
2012-11-13 05:29:39 -08:00
Dirk Dougherty
23492df77f Doc change: resize some assets for highlights.
Change-Id: Ib534f2895e184a112528be2c3bb78b59fa3dd2af
2012-11-13 05:02:41 -08:00
Dirk Dougherty
e320ac7a2b Merge "Doc change: edits to highlights files." into jb-mr1-dev 2012-11-13 04:10:50 -08:00
Dirk Dougherty
8fe036017c Doc change: edits to highlights files.
Change-Id: I1b34725503c88828b10e573d966ac5642aa2bdb8
2012-11-13 04:07:32 -08:00
Scott Main
65bd44fe44 Merge "docs: add jb mr1 api overview" into jb-mr1-dev 2012-11-13 02:25:47 -08:00
Scott Main
576552550d docs: add jb mr1 api overview
Change-Id: I05db9daa6b9b96fef2debabdf35bcbe169fed007
2012-11-13 02:23:51 -08:00
Dirk Dougherty
c17faf8210 Merge "Doc change: Add Android 4.2 platform highlights." into jb-mr1-dev 2012-11-13 01:43:20 -08:00
Dirk Dougherty
c54221533f Doc change: Add Android 4.2 platform highlights.
Change-Id: I7214c1f50a76dbf606747ebe69269aad1280692a
2012-11-13 01:39:14 -08:00
Robert Ly
b03ce7eb9f Merge "docs: add fs to rs" into jb-mr1-dev 2012-11-12 22:22:25 -08:00
Robert Ly
3419e07873 docs: add fs to rs
Change-Id: Icb08977ecf5acbddff35965fa1d7360cece0dd31
2012-11-12 21:56:32 -08:00
Dirk Dougherty
19a346ae49 Merge "Doc change. Add diff report for API level 17." into jb-mr1-dev 2012-11-12 20:57:53 -08:00
Dirk Dougherty
c9469185df Doc change. Add diff report for API level 17.
Change-Id: I90bb4ec37cd9556aa710778aa842d114e6906d53
2012-11-12 20:00:46 -08:00