Robert Ly
|
c4753a7ff2
|
am 2ecb884f: am b481a600: am c7731e07: Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2
* commit '2ecb884f7586218a1608cd5b0d82a45de6f9a069':
cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d
|
2011-06-14 20:57:11 -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
|
b83683a526
|
am 5e69c0f5: am 1dbb7075: am 8467cd7f: Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2
* commit '5e69c0f5569940b5f6a0f9c5a2677639c5ed3062':
cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac
|
2011-06-14 20:57:01 -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
|
7c8c449b8b
|
am 2aeafe0b: am b5c31b8a: am 194f4745: Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2
* commit '2aeafe0baaab1f833110994deb7cd6714cab1d5f':
Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"
|
2011-06-14 20:56:51 -07:00 |
|
Robert Ly
|
c7731e070e
|
Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2
|
2011-06-14 17:45:04 -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
|
8467cd7f90
|
Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2
|
2011-06-14 16:36:17 -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
|
194f47451c
|
Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2
|
2011-06-14 16:35:12 -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
|
86f1ea099a
|
am ae6dc0c5: am cbfab050: am a91d6552: Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
* commit 'ae6dc0c5e213ce5ca3c504020bc73993e1aceb9a':
cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
|
2011-06-14 15:22:51 -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
|
cd944baf51
|
Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"
This reverts commit 1431fd98b1a9b69a8b9a03d07bc408aefe30c28e
|
2011-06-14 15:09:41 -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
|
a91d655291
|
Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
|
2011-06-14 14:56:00 -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 |
|
Robert Ly
|
1431fd98b1
|
cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
Conflicts:
docs/html/sdk/sdk_toc.cs
Change-Id: I03be3486734960c4c691d4d2abe6b17c5114b1a9
|
2011-06-14 11:26:39 -07:00 |
|
Robert Ly
|
ef18aea78d
|
cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac
Change-Id: I7a1ca07b5aac9979b710e78b4d0e33f78ac18cee
|
2011-06-14 11:21:30 -07:00 |
|
Robert Ly
|
de50cace6e
|
cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d
Change-Id: I88d74001d58176ac9ca24265512d92646c345488
|
2011-06-14 11:20:33 -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
|
a0ee44df43
|
am 59a3ad16: am d5335253: am b8236751: Merge "cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11" into honeycomb-mr2
* commit '59a3ad16f57d23eb692b29bf7822dd5011dd7cc5':
cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11
|
2011-06-03 15:29:01 -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 |
|
Joe Malin
|
8c56154d9a
|
am 409db558: am a3d68aed: am d40a5d5c: Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
* commit '409db558b3f47ac28f1291d82bef15a07b2920c3':
Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
|
2011-06-03 13:16:29 -07:00 |
|
Scott Main
|
b4ac9e5ad6
|
am 092b0bd9: am de43d71b: am f128d5d4: Merge "docs: adjust what\'s visible for online and offline docs" into honeycomb-mr2
* commit '092b0bd9b62e3b0fe07dfd4c5a0b3323ff95d2a0':
docs: adjust what's visible for online and offline docs
|
2011-06-02 16:22:39 -07:00 |
|
Scott Main
|
4bd705b196
|
am 2bb7432d: am f18348b1: am a2272130: cherry pick Change-Id: Ia5ac228612569684a4ffc79ab3914442c15edfe2 docs: fix typo and slight revision
* commit '2bb7432d8ff98650a0d3d84b9ac13649474595f9':
cherry pick Change-Id: Ia5ac228612569684a4ffc79ab3914442c15edfe2 docs: fix typo and slight revision
|
2011-06-02 14:05:04 -07:00 |
|
Scott Main
|
a59f305d11
|
am a4ab8bd5: am 70f45917: am f5d8ceae: cherry pick Change-Id: I58ae8210a17f76ff92ee9d064cf42fd4a81ad9b5 docs: fix markup and typos
* commit 'a4ab8bd518f2226b9a0578a70291bfcc7c17bd9c':
cherry pick Change-Id: I58ae8210a17f76ff92ee9d064cf42fd4a81ad9b5 docs: fix markup and typos
|
2011-06-02 14:04:51 -07:00 |
|
Scott Main
|
69ff8ab05b
|
am b9cb731b: am b7cfc618: am 28fb09e0: cherry pick Change-Id: I183ff47e59617b2c17a92b876ca8c8bcc9b45262 docs: add document for the compatibility library
* commit 'b9cb731bb89bd310a17093262ce6483c557d3d4c':
cherry pick Change-Id: I183ff47e59617b2c17a92b876ca8c8bcc9b45262 docs: add document for the compatibility library
|
2011-06-02 14:04:08 -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
|
b823675121
|
Merge "cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11" into honeycomb-mr2
|
2011-06-02 09:49:43 -07:00 |
|
Scott Main
|
25d0b9f3a0
|
cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514
docs: release notes for adt 11
Change-Id: I9041a5e34fcf34e8a08b3e9becc8c149f773a250
|
2011-06-02 09:48:24 -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 |
|
Scott Main
|
f9e43b8cba
|
doc typo
Change-Id: Iab3246e12059582096594eb795f2eb42da46f667
|
2011-06-01 16:28:19 -07:00 |
|
Scott Main
|
f5992953e4
|
docs: fix typos
Change-Id: I59a34a84075c63715a6b4aaf6d90acead321ea90
|
2011-06-01 09:46:04 -07:00 |
|
Joe Malin
|
d40a5d5cb7
|
Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
Change-Id: I48ddc26d4fc8e2e44627cfb0e98d9f0b596042b6
|
2011-05-31 16:36:04 -07:00 |
|