Joe Fernandez
|
a53afedf78
|
docs: Re-write of OpenGL Framework topic
bug 4285030
Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
|
2011-06-29 16:40:22 -07:00 |
|
Scott Main
|
0868f458cc
|
am 7c58d671: am f169bae8: am f8d37ab6: Merge "docs: add emphasis to adding a search button in activity UI" into honeycomb-mr2
* commit '7c58d671d542f3a9923a9ea2e63b46005d81a445':
docs: add emphasis to adding a search button in activity UI
|
2011-06-27 14:14:37 -07:00 |
|
Scott Main
|
4971c3c4a1
|
am 44b48a37: am db76388e: am 9a05cfe5: docs: update docs for new screen support attributes and qualifiers
* commit '44b48a377d47bb27b667ab87347f0a88ba3fba0b':
docs: update docs for new screen support attributes and qualifiers
|
2011-06-27 14:14:26 -07:00 |
|
Scott Main
|
090117774a
|
am d4f9872c: am dc0ae0cb: am 138836ad: Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2
* commit 'd4f9872cb077abc54cfa2def348f831d24e32ca0':
docs: add info about manifest attributes that should not change
|
2011-06-23 14:30:30 -07:00 |
|
Katie McCormick
|
c182bd5162
|
am 02362299: am a108223f: am d4fac2c0: Doc change: updated TOC for Bluetooth CL.
* commit '023622997d886074f7c0cf831945a466803acf5e':
Doc change: updated TOC for Bluetooth CL.
|
2011-06-23 14:29:25 -07:00 |
|
Scott Main
|
f8d37ab6b3
|
Merge "docs: add emphasis to adding a search button in activity UI" into honeycomb-mr2
|
2011-06-23 13:08:27 -07:00 |
|
Scott Main
|
72e0df6573
|
docs: add emphasis to adding a search button in activity UI
Change-Id: I13c4673cdb8caab65dd8d57046f54b0ae3bf48e2
|
2011-06-23 13:07:26 -07:00 |
|
Scott Main
|
9a05cfe542
|
docs: update docs for new screen support attributes and qualifiers
Change-Id: I8fdfd90e5d7970bdbb72e0b3271f047f5ed300ee
|
2011-06-23 11:35:07 -07:00 |
|
Robert Ly
|
f64d0ef991
|
am b6f9e5dd: am 60506b4f: am d60e1b5b: cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
* commit 'b6f9e5dd96e34691743000d9f51e4d5d71ead70a':
cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
|
2011-06-23 08:17:23 -07:00 |
|
Bruno Oliveira
|
f14192bc4f
|
am ecf16143: am 0310f4da: am f5c62362: Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2
* commit 'ecf161437e4a2f2e0493f303119e8b2f090739eb':
Rewriting "Audio and Video" section of Dev Guide.
|
2011-06-23 08:16:55 -07:00 |
|
Scott Main
|
80a0fa0b69
|
am fe8e2fb3: am de937ac0: am bb64fa1e: docs: fix a couple typos
* commit 'fe8e2fb32febccc5c88ca4eba089d747755975d4':
docs: fix a couple typos
|
2011-06-23 07:41:29 -07:00 |
|
Scott Main
|
b0f0245297
|
am 35837c32: am 20fe290e: am beeb7762: docs: fix broken link
* commit '35837c3234a2e888d0a1016f71c5b371a7014f4e':
docs: fix broken link
|
2011-06-23 07:41:15 -07:00 |
|
Scott Main
|
138836adc7
|
Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2
|
2011-06-22 17:45:13 -07:00 |
|
Scott Main
|
9fc3579cab
|
docs: add info about manifest attributes that should not change
Change-Id: Ia58d855ccaa3348bc0a2f7a4b7847ec115c442e8
|
2011-06-22 15:57:37 -07:00 |
|
Katie McCormick
|
d4fac2c026
|
Doc change: updated TOC for Bluetooth CL.
Change-Id: Ifd60e332d3088402e939fc851374800f526f8cdf
|
2011-06-22 14:28:29 -07:00 |
|
Robert Ly
|
d60e1b5b91
|
cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
Change-Id: Ib47cf367f5c9ca66da2921fa86078693198a7968
|
2011-06-22 12:44:02 -07:00 |
|
Bruno Oliveira
|
f5c6236289
|
Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2
|
2011-06-21 16:44:56 -07:00 |
|
Bruno Oliveira
|
54340961bd
|
Rewriting "Audio and Video" section of Dev Guide.
Rewriting the "Audio and Video" section of the Dev Guide, renaming it
Media Framework and adding a more details about MediaPlayer,
interaction between MediaPlayer and services, Audio Focus, etc.
Staging:
http://www.corp.google.com/~btco/tmp/offline-sdk/guide/topics/media/index.html
This is a cherrypick of CL 106666 which was originally on honeycomb-mr1.
Link to old CL:
https://android-git.corp.google.com/g/#change,106666
Change-Id: I0efa4c9ed73af7f9dcb02232a6af4a7527645367
|
2011-06-21 18:55:46 -04:00 |
|
Robert Ly
|
1f8d37d7a3
|
am b2dba991: am d1a19b10: am c7c1ba50: Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit 'b2dba9910b6bcd26d4d5318b9ee63668ecf39e66':
cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
|
2011-06-21 15:29:07 -07:00 |
|
Scott Main
|
68e5ea8973
|
cherrypick from mr2 Change-Id: I59a34a84075c63715a6b4aaf6d90acead321ea90
docs: fix typos
Change-Id: I1e821f9455ee9fcb01d345226f3b606621fdcd8e
|
2011-06-20 17:55:59 -07:00 |
|
Scott Main
|
bb64fa1e3d
|
docs: fix a couple typos
Change-Id: I65e9b59eb48985f21eeea5d0d944b0d8e8b92023
|
2011-06-20 17:22:50 -07:00 |
|
Scott Main
|
beeb776209
|
docs: fix broken link
Change-Id: I5ac2eed824cef817d309b4e4794c430882db5de8
|
2011-06-20 17:17:39 -07:00 |
|
Robert Ly
|
5c0213c967
|
cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
Change-Id: Ica88f38229a66bfad60cbaf5db4bf94cd99c1d19
|
2011-06-16 11:00:47 -07:00 |
|
Robert Ly
|
5f1626372d
|
am 8a8f82bb: am 4963cd0b: am 1a3e7cf2: Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2
* commit '8a8f82bbd606657df8a804b4cd499556e2292404':
cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc
|
2011-06-14 20:57:07 -07:00 |
|
Robert Ly
|
ba8b72a3d1
|
am f3c9a251: am 17cddaf2: am 409b9a4c: Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2
* commit 'f3c9a2517ad9db2af4e11435068c24410eaf9c57':
Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"
|
2011-06-14 20:56:57 -07:00 |
|
Robert Ly
|
1a3e7cf259
|
Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2
|
2011-06-14 17:43:38 -07:00 |
|
Robert Ly
|
409b9a4cad
|
Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2
|
2011-06-14 16:35:22 -07:00 |
|
Robert Ly
|
051d16ebec
|
resolved conflicts for merge of 398d021b to master
Change-Id: I4f8a2cfec95bf31c38365da0257e8d13897bb197
|
2011-06-14 15:50:38 -07:00 |
|
Robert Ly
|
36107a37a2
|
am 0b7d7f53: am b658dfb8: am cbd31aec: Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2
* commit '0b7d7f53a958132eb539fc81130423878c2db650':
cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e
|
2011-06-14 15:25:00 -07:00 |
|
Robert Ly
|
f5d0eb92fb
|
am ff46480e: am 4cd4c820: am 9fa54704: Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit 'ff46480e748555a923242af4238ec8d4822fd2ae':
cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
|
2011-06-14 15:22:47 -07:00 |
|
Dianne Hackborn
|
386f67a152
|
am 8a73d211: am 74c48f2b: am 700a1f25: Merge "Update resources documentation with new qualifiers." into honeycomb-mr2
* commit '8a73d211845671880b0d50fbb0c5caa065066c80':
Update resources documentation with new qualifiers.
|
2011-06-14 15:21:18 -07:00 |
|
Robert Ly
|
86ef7977a9
|
Merge "cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a" into honeycomb-mr2
|
2011-06-14 15:06:42 -07:00 |
|
Robert Ly
|
8077b8b3bb
|
Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"
This reverts commit f25be17f6413417aa6a1e3a5a791302099d15008
|
2011-06-14 15:02:42 -07:00 |
|
Robert Ly
|
cbd31aec9f
|
Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2
|
2011-06-14 14:58:32 -07:00 |
|
Robert Ly
|
f25be17f64
|
cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
Conflicts:
docs/html/guide/topics/usb/adk.jd
Change-Id: I09b7fafd5d946a9e0d42c025089bdab717c8ca3e
|
2011-06-14 11:50:19 -07:00 |
|
Robert Ly
|
f197b639ec
|
cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a
Change-Id: I8b7848139e93df385d0727f9536be73124687cc7
|
2011-06-14 11:27:41 -07:00 |
|
Dianne Hackborn
|
ce67da79e7
|
Update resources documentation with new qualifiers.
Change-Id: I4a3e0d3ece64d8a177157e469c39dbb282094373
|
2011-06-13 22:01:13 -07:00 |
|
Robert Ly
|
bffb5235ac
|
cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc
Change-Id: I77ae1a4f999ae0f4fff925bf8a7f9caf0b868329
|
2011-06-09 12:00:06 -07:00 |
|
Robert Ly
|
4d1824206b
|
cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e
Change-Id: I3a91d80c1d298ed0aa9e01c1e1be313e1e72b444
|
2011-06-09 11:58:57 -07:00 |
|
Frank Sposaro
|
34687664be
|
Merge "Fixed typo. "a a" -> "a""
|
2011-06-07 15:57:11 -07:00 |
|
Frank Sposaro
|
15dc451906
|
Fixed typo. "a a" -> "a"
Change-Id: I600d6f7f5d87766cd841a5e8177581d33dcdd282
|
2011-06-06 13:41:37 -07:00 |
|
Roman Nurik
|
1d3a5c1133
|
am 16475a3a: am 07613835: am e7d60078: Add old blog posts as articles, batch 1
* commit '16475a3a40beac982886ce6bc300f4ffe29f581d':
Add old blog posts as articles, batch 1
|
2011-06-03 18:02:01 -07:00 |
|
Roman Nurik
|
e7d6007872
|
Add old blog posts as articles, batch 1
Change-Id: Ibe1bcf1ceef2eb1a1b4bc0c1b2451ed69838ee3a
|
2011-06-03 16:45:00 -07:00 |
|
Scott Main
|
bb718776a1
|
am b9040e77: am 5b8342cf: am a8629089: Merge "cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add \'animator\' resource info" into honeycomb-mr2
* commit 'b9040e774920c4641c154df2a358100cf78a2bd3':
cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add 'animator' resource info
|
2011-06-03 15:29:17 -07:00 |
|
Scott Main
|
e981ee73a3
|
am 7c8b81c5: am b04ac7ac: am 0d5ed597: Merge "Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links" into honeycomb-mr2
* commit '7c8b81c53674ffbd3fc0cdf29f5fff4548fda085':
Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links
|
2011-06-03 15:28:44 -07:00 |
|
Scott Main
|
e91a45a6cf
|
am 5c6e95a7: am ce214df9: am f58e6c98: Merge "doc typo" into honeycomb-mr2
* commit '5c6e95a77359bd6f758164b7f5a5a92093c2498f':
doc typo
|
2011-06-03 14:43:31 -07:00 |
|
Scott Main
|
a86290891a
|
Merge "cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add 'animator' resource info" into honeycomb-mr2
|
2011-06-02 09:52:09 -07:00 |
|
Scott Main
|
99960b73e9
|
cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e
docs: add 'animator' resource info
Change-Id: Ifbd130e5bf762d89300c20db0d86d7f695b4ff4b
|
2011-06-02 09:51:23 -07:00 |
|
Scott Main
|
0d5ed597b7
|
Merge "Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links" into honeycomb-mr2
|
2011-06-02 09:47:31 -07:00 |
|
Scott Main
|
8f0d336c4d
|
Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b
docs: fix broken links
Change-Id: Ibc71e21b6024a8bed0fc07dba5e0a9c6c5d7f8c0
|
2011-06-02 09:45:53 -07:00 |
|