OSDN Git Service
Scott Main [Mon, 4 Feb 2013 17:07:41 +0000 (09:07 -0800)]
am
8f0e965d: am
b89123dd: am
8b62c402: am
bf1d230b: Merge "docs: delete orphaned images (the obvious ones)" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
8f0e965de78dbe356fb33ce9eced6ddc3bef5132':
docs: delete orphaned images (the obvious ones)
Scott Main [Mon, 4 Feb 2013 17:07:25 +0000 (09:07 -0800)]
am
0031d177: am
e63e6d07: am
3424794d: am
e63dfe5a: docs: fix broken links
# Via Android Git Automerger (3) and Scott Main (1)
* commit '
0031d177b6137a004930c207f57ac5ac9386c72b':
docs: fix broken links
Dirk Dougherty [Mon, 4 Feb 2013 17:07:20 +0000 (09:07 -0800)]
am
29c40abf: am
18e9a79f: am
120f7eb5: am
e929e661: Merge "Doc change: Remove proto scheme from src urls (fix mixed content warning)." into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
29c40abf9eaa6ed5af6100616cf9cf91a47bc477':
Doc change: Remove proto scheme from src urls (fix mixed content warning).
Scott Main [Mon, 4 Feb 2013 17:07:16 +0000 (09:07 -0800)]
am
cd655c53: am
7d47fbf3: am
d2242891: am
e55d5e86: docs: change "android developer console" to "developer console"
# Via Android Git Automerger (3) and Scott Main (1)
* commit '
cd655c53cd97b83b1d86f3c5bb38666392feea26':
docs: change "android developer console" to "developer console"
Scott Main [Mon, 4 Feb 2013 17:07:13 +0000 (09:07 -0800)]
am
2bbaf754: am
80235ca7: am
6c9d6373: am
f216ded9: Merge "docs: clarify usage for adb am component option" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
2bbaf754745a6a31fdc8e2ed5eb90d5790f198e9':
docs: clarify usage for adb am component option
Fabrice Di Meglio [Mon, 4 Feb 2013 17:07:09 +0000 (09:07 -0800)]
am
4dcdfb89: am
f5951baf: (-s ours) am
9fd4893c: (-s ours) am
7bac3614: Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
4dcdfb89015942f57b98861a7fbcef948364b992':
Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE
Dirk Dougherty [Mon, 4 Feb 2013 17:07:05 +0000 (09:07 -0800)]
am
5fca0efa: am
6cb87b08: am
65fd9811: am
2aa47b33: Merge "Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager." into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
5fca0efa17c85945fc42cb1a890889f3fab8ec00':
Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager.
Dirk Dougherty [Mon, 4 Feb 2013 17:07:01 +0000 (09:07 -0800)]
am
d1e1e535: am
a929ea12: am
01084b96: am
3b4b067b: Merge "Doc change: remove duplicate image directory (use /sdk/images instead)." into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
d1e1e5353acfd229190faaf8c7a905c4b23efde1':
Doc change: remove duplicate image directory (use /sdk/images instead).
Scott Main [Mon, 4 Feb 2013 17:06:58 +0000 (09:06 -0800)]
am
960deffd: am
78bf7c9c: am
1e7e1104: am
4b7161cb: docs: switch devsite doc build to use templates-sdk
# Via Android Git Automerger (3) and Scott Main (1)
* commit '
960deffd7818df6276901cc2ed4bf7241fcd6002':
docs: switch devsite doc build to use templates-sdk
Scott Main [Mon, 4 Feb 2013 17:06:55 +0000 (09:06 -0800)]
am
d4f5ce03: am
6dfb4d0a: am
5c37151c: am
e75cd4bf: docs: add hdf bool for deviste, used to change aspects of the templates
# Via Android Git Automerger (3) and Scott Main (1)
* commit '
d4f5ce03a85274026e7ec86f33e515f77e36a8f9':
docs: add hdf bool for deviste, used to change aspects of the templates
Scott Main [Mon, 4 Feb 2013 17:06:51 +0000 (09:06 -0800)]
am
2357d979: am
2e5b2306: am
68d0f32c: am
48f9f83b: Merge "docs: update adb tool page with am and pm reference" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
2357d9796a5dbbbe95c2b27eacf11f0b19d5d9c7':
docs: update adb tool page with am and pm reference
Dirk Dougherty [Mon, 4 Feb 2013 17:06:48 +0000 (09:06 -0800)]
am
e27f64b0: am
1417357e: am
f8a9c509: am
7b32d32b: Merge "Add build rule for ds (devsite) online docs." into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
e27f64b0092f8ce8d9578f7f6e4929fa4eac5782':
Add build rule for ds (devsite) online docs.
Dirk Dougherty [Mon, 4 Feb 2013 17:06:45 +0000 (09:06 -0800)]
am
904ffedb: am
36b58ea9: am
d6e176c8: am
2c1669c4: Merge "Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed." into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
904ffedb7e904246aadcc5519da2adbf112a0430':
Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed.
Adam Koch [Mon, 4 Feb 2013 17:06:41 +0000 (09:06 -0800)]
am
01e89434: am
1826e8c3: am
3ef2c026: am
376e707f: Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see ag/268000)
# Via Android Git Automerger (3) and Adam Koch (1)
* commit '
01e894340f262239254a633817d169fd54ba2268':
Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000)
Dirk Dougherty [Mon, 4 Feb 2013 17:06:38 +0000 (09:06 -0800)]
am
693d0b00: am
fcd84aa0: am
daf487fe: am
df9fa4c6: Doc change: Explicitly declare pages that should use the \'sdk\' page template. This simplifies the assignment of the \'sdk\' hdf var in Doclava.
# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit '
693d0b00006cea2645d6487418e009ec3f328402':
Doc change: Explicitly declare pages that should use the 'sdk' page template. This simplifies the assignment of the 'sdk' hdf var in Doclava.
Scott Main [Fri, 1 Feb 2013 22:33:17 +0000 (14:33 -0800)]
am
b89123dd: am
8b62c402: am
bf1d230b: Merge "docs: delete orphaned images (the obvious ones)" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
b89123ddd492b1e4f75bcc619245345b2f19d570':
docs: delete orphaned images (the obvious ones)
Scott Main [Fri, 1 Feb 2013 22:29:47 +0000 (14:29 -0800)]
am
8b62c402: am
bf1d230b: Merge "docs: delete orphaned images (the obvious ones)" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
8b62c402cdb50b8b1b1ff5d1f17021f89866b4c6':
docs: delete orphaned images (the obvious ones)
Scott Main [Fri, 1 Feb 2013 22:29:39 +0000 (14:29 -0800)]
am
e63e6d07: am
3424794d: am
e63dfe5a: docs: fix broken links
# Via Android Git Automerger (2) and Scott Main (1)
* commit '
e63e6d0711db6ce5c62d3a8a3eadfc580670c3dc':
docs: fix broken links
Dirk Dougherty [Fri, 1 Feb 2013 22:29:35 +0000 (14:29 -0800)]
am
18e9a79f: am
120f7eb5: am
e929e661: Merge "Doc change: Remove proto scheme from src urls (fix mixed content warning)." into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
18e9a79f2a6f1f2e85499f6713f63b091197130b':
Doc change: Remove proto scheme from src urls (fix mixed content warning).
Scott Main [Fri, 1 Feb 2013 22:27:13 +0000 (14:27 -0800)]
am
bf1d230b: Merge "docs: delete orphaned images (the obvious ones)" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit '
bf1d230b05becec58992fb10967b9b6dba67b967':
docs: delete orphaned images (the obvious ones)
Scott Main [Fri, 1 Feb 2013 22:26:11 +0000 (14:26 -0800)]
am
7d47fbf3: am
d2242891: am
e55d5e86: docs: change "android developer console" to "developer console"
# Via Android Git Automerger (2) and Scott Main (1)
* commit '
7d47fbf346a31c07a403bf6898220e7e4045ed34':
docs: change "android developer console" to "developer console"
Scott Main [Fri, 1 Feb 2013 22:26:09 +0000 (14:26 -0800)]
am
80235ca7: am
6c9d6373: am
f216ded9: Merge "docs: clarify usage for adb am component option" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
80235ca788537c9acd133f40066c3c75f3585a2e':
docs: clarify usage for adb am component option
Fabrice Di Meglio [Fri, 1 Feb 2013 22:26:05 +0000 (14:26 -0800)]
am
f5951baf: (-s ours) am
9fd4893c: (-s ours) am
7bac3614: Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
f5951baf7dcc426485badf19985148b6a2fcf82e':
Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE
Scott Main [Fri, 1 Feb 2013 22:26:05 +0000 (14:26 -0800)]
am
3424794d: am
e63dfe5a: docs: fix broken links
# Via Android Git Automerger (1) and Scott Main (1)
* commit '
3424794d55ff5c97c89d930d9ad2a577cb2b2f52':
docs: fix broken links
Dirk Dougherty [Fri, 1 Feb 2013 22:26:03 +0000 (14:26 -0800)]
am
6cb87b08: am
65fd9811: am
2aa47b33: Merge "Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager." into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
6cb87b088381f4c0cba334a1285d8d170458b793':
Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager.
Dirk Dougherty [Fri, 1 Feb 2013 22:26:01 +0000 (14:26 -0800)]
am
120f7eb5: am
e929e661: Merge "Doc change: Remove proto scheme from src urls (fix mixed content warning)." into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
120f7eb5e25ce884c30454ae9ad56b1e2c3de101':
Doc change: Remove proto scheme from src urls (fix mixed content warning).
Dirk Dougherty [Fri, 1 Feb 2013 22:25:58 +0000 (14:25 -0800)]
am
a929ea12: am
01084b96: am
3b4b067b: Merge "Doc change: remove duplicate image directory (use /sdk/images instead)." into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
a929ea12d8291dee5804b3a9a1e5a54719224d41':
Doc change: remove duplicate image directory (use /sdk/images instead).
Scott Main [Fri, 1 Feb 2013 22:25:52 +0000 (14:25 -0800)]
am
78bf7c9c: am
1e7e1104: am
4b7161cb: docs: switch devsite doc build to use templates-sdk
# Via Android Git Automerger (2) and Scott Main (1)
* commit '
78bf7c9c0c4ded4efe8a2bd7255ee1a1b0ec513e':
docs: switch devsite doc build to use templates-sdk
Scott Main [Fri, 1 Feb 2013 22:25:45 +0000 (14:25 -0800)]
am
6dfb4d0a: am
5c37151c: am
e75cd4bf: docs: add hdf bool for deviste, used to change aspects of the templates
# Via Android Git Automerger (2) and Scott Main (1)
* commit '
6dfb4d0a4ed8877c89f4dcfd76918af9da59dba5':
docs: add hdf bool for deviste, used to change aspects of the templates
Scott Main [Fri, 1 Feb 2013 22:25:42 +0000 (14:25 -0800)]
am
2e5b2306: am
68d0f32c: am
48f9f83b: Merge "docs: update adb tool page with am and pm reference" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
2e5b230639fc4946de962c3e53ed26685b8b54b8':
docs: update adb tool page with am and pm reference
Dirk Dougherty [Fri, 1 Feb 2013 22:25:39 +0000 (14:25 -0800)]
am
1417357e: am
f8a9c509: am
7b32d32b: Merge "Add build rule for ds (devsite) online docs." into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
1417357e005c7d751ecf95a7100bbc5ce3dbe669':
Add build rule for ds (devsite) online docs.
Dirk Dougherty [Fri, 1 Feb 2013 22:25:34 +0000 (14:25 -0800)]
am
36b58ea9: am
d6e176c8: am
2c1669c4: Merge "Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed." into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
36b58ea919140a20c7bc4315becad5d6737d1a94':
Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed.
Adam Koch [Fri, 1 Feb 2013 22:25:29 +0000 (14:25 -0800)]
am
1826e8c3: am
3ef2c026: am
376e707f: Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see ag/268000)
# Via Android Git Automerger (2) and Adam Koch (1)
* commit '
1826e8c36de8937652416c7702addc6fc7efc489':
Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000)
Dirk Dougherty [Fri, 1 Feb 2013 22:25:25 +0000 (14:25 -0800)]
am
fcd84aa0: am
daf487fe: am
df9fa4c6: Doc change: Explicitly declare pages that should use the \'sdk\' page template. This simplifies the assignment of the \'sdk\' hdf var in Doclava.
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit '
fcd84aa0a8d83490c2b6c14ed08b63297ca99a1b':
Doc change: Explicitly declare pages that should use the 'sdk' page template. This simplifies the assignment of the 'sdk' hdf var in Doclava.
Scott Main [Fri, 1 Feb 2013 22:22:47 +0000 (22:22 +0000)]
Merge "docs: delete orphaned images (the obvious ones)" into jb-mr1-dev
Scott Main [Fri, 1 Feb 2013 22:22:40 +0000 (14:22 -0800)]
am
e63dfe5a: docs: fix broken links
# Via Scott Main
* commit '
e63dfe5a4804b24e3acb537763d821036b5bb87f':
docs: fix broken links
Dirk Dougherty [Fri, 1 Feb 2013 22:22:35 +0000 (14:22 -0800)]
am
e929e661: Merge "Doc change: Remove proto scheme from src urls (fix mixed content warning)." into jb-mr1-dev
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '
e929e66197bf1421c3afbada964b1a33816ccaa8':
Doc change: Remove proto scheme from src urls (fix mixed content warning).
Scott Main [Fri, 1 Feb 2013 22:22:31 +0000 (14:22 -0800)]
am
d2242891: am
e55d5e86: docs: change "android developer console" to "developer console"
# Via Android Git Automerger (1) and Scott Main (1)
* commit '
d2242891dfe37838e47b24c161108365a368aa86':
docs: change "android developer console" to "developer console"
Scott Main [Fri, 1 Feb 2013 22:22:29 +0000 (14:22 -0800)]
am
6c9d6373: am
f216ded9: Merge "docs: clarify usage for adb am component option" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
6c9d637339c87a9c0938528d862f1fa0723b7e8e':
docs: clarify usage for adb am component option
Fabrice Di Meglio [Fri, 1 Feb 2013 22:22:24 +0000 (14:22 -0800)]
am
9fd4893c: (-s ours) am
7bac3614: Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
9fd4893c56747a154094ecf1a1733a5faf7f8976':
Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE
Dirk Dougherty [Fri, 1 Feb 2013 22:22:20 +0000 (14:22 -0800)]
am
65fd9811: am
2aa47b33: Merge "Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager." into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
65fd9811d3b00698ab25233543c2e49ef22c634b':
Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager.
Dirk Dougherty [Fri, 1 Feb 2013 22:22:16 +0000 (14:22 -0800)]
am
01084b96: am
3b4b067b: Merge "Doc change: remove duplicate image directory (use /sdk/images instead)." into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
01084b96a15885698d602ee563dc8e18bf52acfa':
Doc change: remove duplicate image directory (use /sdk/images instead).
Scott Main [Fri, 1 Feb 2013 22:22:13 +0000 (14:22 -0800)]
am
1e7e1104: am
4b7161cb: docs: switch devsite doc build to use templates-sdk
# Via Android Git Automerger (1) and Scott Main (1)
* commit '
1e7e1104c422d89393565bba591479c1ccbae06d':
docs: switch devsite doc build to use templates-sdk
Scott Main [Fri, 1 Feb 2013 22:22:10 +0000 (14:22 -0800)]
am
5c37151c: am
e75cd4bf: docs: add hdf bool for deviste, used to change aspects of the templates
# Via Android Git Automerger (1) and Scott Main (1)
* commit '
5c37151cb07519affba8e20018e0f0069d426527':
docs: add hdf bool for deviste, used to change aspects of the templates
Scott Main [Fri, 1 Feb 2013 22:22:07 +0000 (14:22 -0800)]
am
68d0f32c: am
48f9f83b: Merge "docs: update adb tool page with am and pm reference" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
68d0f32c09063e4ede569e84f8726dc1e96ab044':
docs: update adb tool page with am and pm reference
Dirk Dougherty [Fri, 1 Feb 2013 22:22:03 +0000 (14:22 -0800)]
am
f8a9c509: am
7b32d32b: Merge "Add build rule for ds (devsite) online docs." into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
f8a9c5090c7b9e4cfd27bf65093939381746e638':
Add build rule for ds (devsite) online docs.
Dirk Dougherty [Fri, 1 Feb 2013 22:21:57 +0000 (14:21 -0800)]
am
d6e176c8: am
2c1669c4: Merge "Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed." into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
d6e176c807d503beb1241ba73355a73ceca47e3e':
Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed.
Adam Koch [Fri, 1 Feb 2013 22:21:54 +0000 (14:21 -0800)]
am
3ef2c026: am
376e707f: Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see ag/268000)
# Via Adam Koch (1) and Android Git Automerger (1)
* commit '
3ef2c0265439af10145be981407d63504e14d9f7':
Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000)
Dirk Dougherty [Fri, 1 Feb 2013 22:21:52 +0000 (14:21 -0800)]
am
daf487fe: am
df9fa4c6: Doc change: Explicitly declare pages that should use the \'sdk\' page template. This simplifies the assignment of the \'sdk\' hdf var in Doclava.
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '
daf487fe22c0a7fe754390a0bfef5d6b28fdd12b':
Doc change: Explicitly declare pages that should use the 'sdk' page template. This simplifies the assignment of the 'sdk' hdf var in Doclava.
Scott Main [Fri, 1 Feb 2013 22:18:51 +0000 (14:18 -0800)]
docs: fix broken links
Change-Id: I7c63b1a2cfe016744fbef532354821bff024ee17
Dirk Dougherty [Fri, 1 Feb 2013 22:03:41 +0000 (22:03 +0000)]
Merge "Doc change: Remove proto scheme from src urls (fix mixed content warning)." into jb-mr1-dev
Dirk Dougherty [Fri, 1 Feb 2013 21:35:42 +0000 (13:35 -0800)]
Doc change: Remove proto scheme from src urls (fix mixed content warning).
Change-Id: I405d0f2e3df5e6e22bf9b09be27f7f7a2d93ba5a
Scott Main [Fri, 1 Feb 2013 21:28:19 +0000 (13:28 -0800)]
am
e55d5e86: docs: change "android developer console" to "developer console"
# Via Scott Main
* commit '
e55d5e864b133df8ccf9f92ca4a5d3accb1dab5c':
docs: change "android developer console" to "developer console"
Scott Main [Fri, 1 Feb 2013 21:28:15 +0000 (13:28 -0800)]
am
f216ded9: Merge "docs: clarify usage for adb am component option" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit '
f216ded93a783cd4e512f59ba50d04a89d59a267':
docs: clarify usage for adb am component option
Fabrice Di Meglio [Fri, 1 Feb 2013 21:28:12 +0000 (13:28 -0800)]
am
7bac3614: Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Fabrice Di Meglio (1)
* commit '
7bac3614ff0ee3cef83147cb569c96c00beab919':
Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE
Dirk Dougherty [Fri, 1 Feb 2013 21:28:08 +0000 (13:28 -0800)]
am
2aa47b33: Merge "Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager." into jb-mr1-dev
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '
2aa47b336227a5d2bd1ee91f8fb4bd84be7e97f0':
Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager.
Dirk Dougherty [Fri, 1 Feb 2013 21:28:05 +0000 (13:28 -0800)]
am
3b4b067b: Merge "Doc change: remove duplicate image directory (use /sdk/images instead)." into jb-mr1-dev
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '
3b4b067baec59207640d534be86c7c6c12b06678':
Doc change: remove duplicate image directory (use /sdk/images instead).
Scott Main [Fri, 1 Feb 2013 21:28:01 +0000 (13:28 -0800)]
am
4b7161cb: docs: switch devsite doc build to use templates-sdk
# Via Scott Main
* commit '
4b7161cbd44f64537d2c661e87868ea2689dd126':
docs: switch devsite doc build to use templates-sdk
Scott Main [Fri, 1 Feb 2013 21:27:57 +0000 (13:27 -0800)]
am
e75cd4bf: docs: add hdf bool for deviste, used to change aspects of the templates
# Via Scott Main
* commit '
e75cd4bfd176fbb1483ec5e17edfbd993adce40f':
docs: add hdf bool for deviste, used to change aspects of the templates
Scott Main [Fri, 1 Feb 2013 21:27:51 +0000 (13:27 -0800)]
am
48f9f83b: Merge "docs: update adb tool page with am and pm reference" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit '
48f9f83ba27bf3a5cac224e30821836b3956c87c':
docs: update adb tool page with am and pm reference
Dirk Dougherty [Fri, 1 Feb 2013 21:27:48 +0000 (13:27 -0800)]
am
7b32d32b: Merge "Add build rule for ds (devsite) online docs." into jb-mr1-dev
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '
7b32d32bd38b423dd141e7ead89205b9b7929497':
Add build rule for ds (devsite) online docs.
Dirk Dougherty [Fri, 1 Feb 2013 21:27:35 +0000 (13:27 -0800)]
am
2c1669c4: Merge "Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed." into jb-mr1-dev
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '
2c1669c427826fba48ae7776e34f90cdcc5a3a20':
Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed.
Adam Koch [Fri, 1 Feb 2013 21:27:26 +0000 (13:27 -0800)]
am
376e707f: Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see ag/268000)
# Via Adam Koch
* commit '
376e707f65b3ee6e00953466d6367642d2a02b4b':
Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000)
Dirk Dougherty [Fri, 1 Feb 2013 21:27:19 +0000 (13:27 -0800)]
am
df9fa4c6: Doc change: Explicitly declare pages that should use the \'sdk\' page template. This simplifies the assignment of the \'sdk\' hdf var in Doclava.
# Via Dirk Dougherty
* commit '
df9fa4c602e986495fe8795fb800858b48693040':
Doc change: Explicitly declare pages that should use the 'sdk' page template. This simplifies the assignment of the 'sdk' hdf var in Doclava.
Scott Main [Fri, 1 Feb 2013 19:57:01 +0000 (11:57 -0800)]
docs: delete orphaned images (the obvious ones)
Change-Id: Ib6219e65a05925a13a26c415c69431bc2fbbdc68
Xia Wang [Thu, 31 Jan 2013 03:01:14 +0000 (19:01 -0800)]
am
599f9611: am
f3ef10b1: am
2297d1e7: Merge "Fix WiFi test:" into jb-mr1.1-dev
# Via Android Git Automerger (2) and others
* commit '
599f9611aab587d13b4d7bac94fc628c675591a1':
Fix WiFi test:
Xia Wang [Thu, 31 Jan 2013 02:59:22 +0000 (18:59 -0800)]
am
f3ef10b1: am
2297d1e7: Merge "Fix WiFi test:" into jb-mr1.1-dev
# Via Android (Google) Code Review (1) and others
* commit '
f3ef10b12b61891962eb6253e95c8c9eec82d383':
Fix WiFi test:
Xia Wang [Thu, 31 Jan 2013 02:57:50 +0000 (18:57 -0800)]
am
2297d1e7: Merge "Fix WiFi test:" into jb-mr1.1-dev
# Via Android (Google) Code Review (1) and Xia Wang (1)
* commit '
2297d1e78cc70d4e19d9e7c66d24fc494455166c':
Fix WiFi test:
Xia Wang [Thu, 31 Jan 2013 02:54:55 +0000 (02:54 +0000)]
Merge "Fix WiFi test:" into jb-mr1.1-dev
Xia Wang [Wed, 30 Jan 2013 23:02:21 +0000 (15:02 -0800)]
Fix WiFi test:
-- In environment where there are too many APs, sometimes, the AP will not show in the scan list.
Part of the reason is due to the change that the scanning on each frequency is shortened to save power.
to avoid that, change the test to connect without scanning.
-- Increase the timer to wait for WiFi to be connected
Change-Id: If1a72607b3c7ad13dbbf788607665986eaf5b6b3
Scott Main [Wed, 30 Jan 2013 23:54:18 +0000 (15:54 -0800)]
docs: change "android developer console" to "developer console"
Change-Id: I7071e97ed22c2971880c0f63cb10f83f887c9935
Scott Main [Wed, 30 Jan 2013 23:17:33 +0000 (23:17 +0000)]
Merge "docs: clarify usage for adb am component option" into jb-mr1-dev
Scott Main [Wed, 30 Jan 2013 23:16:10 +0000 (15:16 -0800)]
docs: clarify usage for adb am component option
Change-Id: I0b99dffc0b9d465c3a639bd1f7760561e40e2a5f
Fabrice Di Meglio [Wed, 30 Jan 2013 23:04:24 +0000 (23:04 +0000)]
Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE" into jb-mr1-dev
Fabrice Di Meglio [Thu, 15 Nov 2012 01:59:06 +0000 (17:59 -0800)]
Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE
Change-Id: I19b7a53c1c7d805fb9b1611e8944db27c82fc986
Kenny Root [Wed, 30 Jan 2013 06:59:33 +0000 (22:59 -0800)]
am
c3ee1d9a: am
7ad885e2: Merge "One more fix for incorrect indices."
# By Stephen Hines
# Via Android Git Automerger (1) and others
* commit '
c3ee1d9aea36bb7c33dee6211905d4c1ab2681a1':
One more fix for incorrect indices.
Kenny Root [Wed, 30 Jan 2013 06:56:40 +0000 (22:56 -0800)]
am
7ad885e2: Merge "One more fix for incorrect indices."
# By Stephen Hines
# Via Gerrit Code Review (1) and Stephen Hines (1)
* commit '
7ad885e2e6c845dbec4f16cd71e859240741dbf9':
One more fix for incorrect indices.
Kenny Root [Wed, 30 Jan 2013 05:54:03 +0000 (05:54 +0000)]
Merge "One more fix for incorrect indices."
Doug Zongker [Wed, 30 Jan 2013 01:01:01 +0000 (17:01 -0800)]
am
b616f0c2: add android.permission.LOOP_RADIO for access to loop radio device
# Via Doug Zongker
* commit '
b616f0c239ad61f818741909821b86aceff60b60':
add android.permission.LOOP_RADIO for access to loop radio device
Dirk Dougherty [Tue, 29 Jan 2013 23:40:00 +0000 (23:40 +0000)]
Merge "Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager." into jb-mr1-dev
Dirk Dougherty [Tue, 29 Jan 2013 23:00:04 +0000 (15:00 -0800)]
Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager.
Change-Id: I9cfa53e605f476daf6cf914f256df600e1d77f89
Dirk Dougherty [Tue, 29 Jan 2013 23:09:41 +0000 (23:09 +0000)]
Merge "Doc change: remove duplicate image directory (use /sdk/images instead)." into jb-mr1-dev
Dirk Dougherty [Tue, 29 Jan 2013 22:26:02 +0000 (14:26 -0800)]
Doc change: remove duplicate image directory (use /sdk/images instead).
Change-Id: If987d7a31d8b9dc203e9d224a59aeeab8aa5297f
Scott Main [Tue, 29 Jan 2013 22:20:13 +0000 (14:20 -0800)]
docs: switch devsite doc build to use templates-sdk
Change-Id: I933cbafa0712de47b4bcf72d2a7c4f99bf18f930
Doug Zongker [Tue, 29 Jan 2013 17:05:21 +0000 (09:05 -0800)]
add android.permission.LOOP_RADIO for access to loop radio device
Change-Id: I811d70fa67aa758122678809f32b8aade42ced0f
Scott Main [Tue, 29 Jan 2013 16:29:40 +0000 (08:29 -0800)]
docs: add hdf bool for deviste, used to change aspects of the templates
Change-Id: I6ad24252f10211a88d1f98e356bc9da97442f91c
Scott Main [Tue, 29 Jan 2013 00:49:05 +0000 (00:49 +0000)]
Merge "docs: update adb tool page with am and pm reference" into jb-mr1-dev
Dirk Dougherty [Tue, 29 Jan 2013 00:40:57 +0000 (00:40 +0000)]
Merge "Add build rule for ds (devsite) online docs." into jb-mr1-dev
Dirk Dougherty [Mon, 28 Jan 2013 23:43:49 +0000 (15:43 -0800)]
Add build rule for ds (devsite) online docs.
Change-Id: I4f1d099995402613f58401a506ba272abfb563ba
Dirk Dougherty [Mon, 28 Jan 2013 21:26:01 +0000 (21:26 +0000)]
Merge "Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed." into jb-mr1-dev
Dirk Dougherty [Mon, 28 Jan 2013 20:19:24 +0000 (12:19 -0800)]
Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed.
Change-Id: Ib33511f75b72a8019fffb13d396b608cf8e270d2
Amith Yamasani [Mon, 28 Jan 2013 19:41:06 +0000 (11:41 -0800)]
am
1f6178fd: am
abcb9b96: Merge "Added focusable true on search_button for D-pad."
# By Ki-Hwan Lee
# Via Android Git Automerger (1) and others
* commit '
1f6178fd0442338c94cef2fcf12e59c9ce1cf556':
Added focusable true on search_button for D-pad.
Adam Powell [Mon, 28 Jan 2013 19:41:03 +0000 (11:41 -0800)]
am
783fe429: am
e305e5f6: Merge "show SELECT ALL icon with text in landscape mode"
# By Sungmin Choi
# Via Android Git Automerger (1) and others
* commit '
783fe4295372cee8d024388221414c253802c995':
show SELECT ALL icon with text in landscape mode
Amith Yamasani [Mon, 28 Jan 2013 19:37:48 +0000 (11:37 -0800)]
am
abcb9b96: Merge "Added focusable true on search_button for D-pad."
# By Ki-Hwan Lee
# Via Gerrit Code Review (1) and Ki-Hwan Lee (1)
* commit '
abcb9b96f8d1e3780cf63502ca86a00b3f314b39':
Added focusable true on search_button for D-pad.
Adam Powell [Mon, 28 Jan 2013 19:37:41 +0000 (11:37 -0800)]
am
e305e5f6: Merge "show SELECT ALL icon with text in landscape mode"
# By Sungmin Choi
# Via Gerrit Code Review (1) and Sungmin Choi (1)
* commit '
e305e5f68df8338cb3c4bdcf099d23ec9abce564':
show SELECT ALL icon with text in landscape mode
Adam Koch [Mon, 28 Jan 2013 18:58:14 +0000 (13:58 -0500)]
Displaying Bitmaps Efficiently Training - Update sample app
Update sample app zip (see http://ag/268000)
Change-Id: I678b9286552d559358b0e58cbac0475dbe5e10a1
Scott Main [Thu, 10 Jan 2013 02:46:57 +0000 (18:46 -0800)]
docs: update adb tool page with am and pm reference
Change-Id: I7b0e5c95a0d98b91c0a8ed39962b52f8ace47c3b
Amith Yamasani [Mon, 28 Jan 2013 18:46:37 +0000 (18:46 +0000)]
Merge "Added focusable true on search_button for D-pad."
Adam Powell [Mon, 28 Jan 2013 18:44:10 +0000 (18:44 +0000)]
Merge "show SELECT ALL icon with text in landscape mode"
Amith Yamasani [Mon, 28 Jan 2013 18:31:01 +0000 (10:31 -0800)]
am
0b515aec: am
3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström
# Via Android Git Automerger (1) and others
* commit '
0b515aece642283a25c6a4416f0aecdaf17bdb58':
Fix possible integer overflow in MtpStorage
OSDN Git Service
