OSDN Git Service
Xavier Ducrohet [Tue, 12 Feb 2013 23:48:07 +0000 (15:48 -0800)]
am
f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev
# Via Android (Google) Code Review (1) and Xavier Ducrohet (1)
* commit '
f70b8c1cebbf873031bc92bb6ae3be813830d300':
Fix DateFormat for layoutlib.
Xavier Ducrohet [Tue, 12 Feb 2013 23:44:39 +0000 (23:44 +0000)]
Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev
Xavier Ducrohet [Tue, 12 Feb 2013 22:05:32 +0000 (14:05 -0800)]
Fix DateFormat for layoutlib.
Change-Id: I389c9d106b93b9f81dd3614398a5b66ba2b39a70
Robert Ly [Tue, 12 Feb 2013 21:51:52 +0000 (13:51 -0800)]
am
2328a779: am
9eb66b2d: Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev
# Via Android (Google) Code Review (2) and Android Git Automerger (1)
* commit '
2328a77980a8e4aa2dafac1b9a8e228877a7425c':
Revert "makefile changes for gcm javadocs"
Robert Ly [Tue, 12 Feb 2013 21:49:44 +0000 (13:49 -0800)]
am
9eb66b2d: Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev
# Via Android (Google) Code Review
* commit '
9eb66b2db4724da7a2d6575fee29840004f1a5df':
Revert "makefile changes for gcm javadocs"
Robert Ly [Tue, 12 Feb 2013 21:46:06 +0000 (21:46 +0000)]
Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev
Robert Ly [Tue, 12 Feb 2013 21:39:28 +0000 (21:39 +0000)]
Revert "makefile changes for gcm javadocs"
This reverts commit
5f9922d7c3bce158e4c7a58929d4075e7c91e32e
Change-Id: I310f27b231c6d64d6d407ae451b189a6ecf6b34f
Robert Ly [Tue, 12 Feb 2013 18:43:16 +0000 (10:43 -0800)]
am
a95a64dd: am
dc8ee206: Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev
# Via Android (Google) Code Review (2) and Android Git Automerger (1)
* commit '
a95a64ddd6155e90308aa1368e2c8098d86e677f':
Revert "makefile changes for s.a.c"
Robert Ly [Tue, 12 Feb 2013 18:41:20 +0000 (10:41 -0800)]
am
dc8ee206: Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev
# Via Android (Google) Code Review
* commit '
dc8ee2066a45adc6a57157c550e65317c8650ca0':
Revert "makefile changes for s.a.c"
Robert Ly [Tue, 12 Feb 2013 18:37:51 +0000 (18:37 +0000)]
Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev
Robert Ly [Tue, 12 Feb 2013 18:29:10 +0000 (18:29 +0000)]
Revert "makefile changes for s.a.c"
This reverts commit
4c01047ec7b06aabeeae273c7871caa6c3029b84
Change-Id: I4465cfa678717ff7c202347ae6ad36d12d5393bc
Scott Main [Tue, 12 Feb 2013 00:55:08 +0000 (16:55 -0800)]
am
72091355: am
bfec2a01: docs: nudge dashboard chart to the right to avoid overlap
# Via Android Git Automerger (1) and Scott Main (1)
* commit '
7209135504313c27da4f277235e00db6851b9577':
docs: nudge dashboard chart to the right to avoid overlap
Scott Main [Tue, 12 Feb 2013 00:52:51 +0000 (16:52 -0800)]
am
bfec2a01: docs: nudge dashboard chart to the right to avoid overlap
# Via Scott Main
* commit '
bfec2a01896959ba2bc9a995238eb31644ea8dc6':
docs: nudge dashboard chart to the right to avoid overlap
Scott Main [Mon, 11 Feb 2013 22:24:03 +0000 (14:24 -0800)]
docs: nudge dashboard chart to the right to avoid overlap
Change-Id: I852004b6dbd7ca8343a20f05da1166cff2d2898a
Robert Ly [Mon, 11 Feb 2013 22:13:12 +0000 (14:13 -0800)]
am
96b1b403: am
4c01047e: makefile changes for s.a.c
# Via Android Git Automerger (1) and Robert Ly (1)
* commit '
96b1b403b6ecf0daa2d7d0a8475e0d087790e457':
makefile changes for s.a.c
Robert Ly [Mon, 11 Feb 2013 22:10:00 +0000 (14:10 -0800)]
am
4c01047e: makefile changes for s.a.c
# Via Robert Ly
* commit '
4c01047ec7b06aabeeae273c7871caa6c3029b84':
makefile changes for s.a.c
Robert Ly [Fri, 8 Feb 2013 22:37:13 +0000 (14:37 -0800)]
makefile changes for s.a.c
Change-Id: I501cc140994b2822c3df1f00639076f17765f256
Dirk Dougherty [Mon, 11 Feb 2013 19:26:19 +0000 (11:26 -0800)]
am
337d3e32: am
7d849491: Doc change: fix typos.
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '
337d3e3240e52ca5321029fdd23d2f2a3e1201d8':
Doc change: fix typos.
Dirk Dougherty [Mon, 11 Feb 2013 19:23:28 +0000 (11:23 -0800)]
am
7d849491: Doc change: fix typos.
# Via Dirk Dougherty
* commit '
7d8494913292dcdbe25d046cbef6e349d904b41c':
Doc change: fix typos.
Dirk Dougherty [Mon, 11 Feb 2013 19:18:59 +0000 (11:18 -0800)]
Doc change: fix typos.
Change-Id: I58c8841c9bf23bc75e1b25d63af917ff56087fdc
Dirk Dougherty [Fri, 8 Feb 2013 19:16:11 +0000 (11:16 -0800)]
am
f2d89ef9: am
64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
f2d89ef9d57b096962b802608a88d3483a51d08a':
Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
Dirk Dougherty [Fri, 8 Feb 2013 19:14:23 +0000 (11:14 -0800)]
am
64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '
64ab8fdcb0a3015d3e6c4db0a1d66443085fd673':
Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
Dirk Dougherty [Fri, 8 Feb 2013 19:09:53 +0000 (19:09 +0000)]
Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
Robert Ly [Fri, 8 Feb 2013 01:55:20 +0000 (17:55 -0800)]
am
9da9a7cd: am
e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
9da9a7cda27a9b9a3a08e64e81d0ca10ac4c4ec1':
makefile changes for gcm javadocs
Robert Ly [Fri, 8 Feb 2013 01:53:29 +0000 (17:53 -0800)]
am
e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Robert Ly (1)
* commit '
e60b6023ae4fdea932d0effc553dddc38117d235':
makefile changes for gcm javadocs
Robert Ly [Fri, 8 Feb 2013 01:48:14 +0000 (01:48 +0000)]
Merge "makefile changes for gcm javadocs" into jb-mr1-dev
Dirk Dougherty [Fri, 8 Feb 2013 01:32:35 +0000 (17:32 -0800)]
Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
Change-Id: I3003fa163f7c9e10925d96f8d89005b42baed315
Katie McCormick [Fri, 8 Feb 2013 01:21:29 +0000 (17:21 -0800)]
am
b68702eb: am
0e66f16a: Merge "Doc change: Scroller Javadoc Bug #
7966653" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
b68702eb0526633e51d9dbfe6fc971c168e1274a':
Doc change: Scroller Javadoc Bug #
7966653
Katie McCormick [Fri, 8 Feb 2013 01:18:48 +0000 (17:18 -0800)]
am
0e66f16a: Merge "Doc change: Scroller Javadoc Bug #
7966653" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Katie McCormick (1)
* commit '
0e66f16abd651bdf5833f4aede4899e627d7b333':
Doc change: Scroller Javadoc Bug #
7966653
Katie McCormick [Fri, 8 Feb 2013 01:14:47 +0000 (01:14 +0000)]
Merge "Doc change: Scroller Javadoc Bug #
7966653" into jb-mr1-dev
Katie McCormick [Thu, 7 Feb 2013 02:15:13 +0000 (18:15 -0800)]
Doc change: Scroller Javadoc Bug #
7966653
Change-Id: I4365946f890a76fcfa78ca9d69f2a8e0848095a9
Katie McCormick [Thu, 7 Feb 2013 23:52:32 +0000 (15:52 -0800)]
am
ef4196d0: am
89fafaea: Doc update: clean up
# Via Android Git Automerger (1) and Katie McCormick (1)
* commit '
ef4196d0ec0a5e89c51b3cc455f083af2fbf3b98':
Doc update: clean up
Katie McCormick [Thu, 7 Feb 2013 23:49:36 +0000 (15:49 -0800)]
am
89fafaea: Doc update: clean up
# Via Katie McCormick
* commit '
89fafaeae73cc265f13775944ccb2841bbc6766c':
Doc update: clean up
Katie McCormick [Thu, 7 Feb 2013 22:23:14 +0000 (14:23 -0800)]
Doc update: clean up
Change-Id: Idd11b36d54e01671d45764dd6ed327621a3fa682
Robert Ly [Wed, 5 Dec 2012 01:01:46 +0000 (17:01 -0800)]
makefile changes for gcm javadocs
Change-Id: I5653eb710f13f0a097cb1cf447469c4da7342fe2
Scott Main [Wed, 6 Feb 2013 20:20:59 +0000 (12:20 -0800)]
am
805d2e2d: am
00f49084: Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
805d2e2d98fa8749d6ae38650c77c79611174944':
docs: fix renderscript links that currently require redirect
Scott Main [Wed, 6 Feb 2013 20:19:30 +0000 (12:19 -0800)]
am
00f49084: Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit '
00f490844d89b146e5490204a5a483834950c489':
docs: fix renderscript links that currently require redirect
Scott Main [Wed, 6 Feb 2013 20:14:48 +0000 (20:14 +0000)]
Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev
Adam Powell [Wed, 6 Feb 2013 00:51:01 +0000 (16:51 -0800)]
am
07cf971e: Fix re-enabled state of up after action view collapse
# Via Adam Powell
* commit '
07cf971e58aecab76f2b5b575cfe62120005c6e4':
Fix re-enabled state of up after action view collapse
Adam Powell [Wed, 6 Feb 2013 00:13:57 +0000 (16:13 -0800)]
Fix re-enabled state of up after action view collapse
A certain call ordering to the action bar could cause the record of
the pre-action view expanded home button enabled state to be
incorrect. Store this in all cases, not just when the action view is
initially expanded. (Except for when we actually disable it for the
expanded view.)
If an action view is already expanded when we get a call to change the
enabled state of the home/up button, don't modify the state of the up
container or other accessibility info, but record the new state if
requested.
Bug
8142097
Change-Id: I070c151aa9f2046d2114ee541d964bf68c6f0def
Robert Ly [Tue, 5 Feb 2013 23:22:52 +0000 (15:22 -0800)]
am
5e9be5bc: am
d6e0c147: Merge "docs: update auth doc to mention multiple scopes bug
7644251" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
5e9be5bcf2d423e516d3c061fffc989ffa444212':
docs: update auth doc to mention multiple scopes bug
7644251
Robert Ly [Tue, 5 Feb 2013 23:19:45 +0000 (15:19 -0800)]
am
d6e0c147: Merge "docs: update auth doc to mention multiple scopes bug
7644251" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Robert Ly (1)
* commit '
d6e0c147175708bcc02813fc0f4008179e95b9e7':
docs: update auth doc to mention multiple scopes bug
7644251
Robert Ly [Tue, 5 Feb 2013 23:17:01 +0000 (23:17 +0000)]
Merge "docs: update auth doc to mention multiple scopes bug
7644251" into jb-mr1-dev
Scott Main [Tue, 5 Feb 2013 22:23:13 +0000 (14:23 -0800)]
docs: fix renderscript links that currently require redirect
Change-Id: Ie12ff2c4be5ca22ac43dfe3a16868c7bef8e4ae8
quddusc [Tue, 5 Feb 2013 20:31:45 +0000 (12:31 -0800)]
am
640d570d: am
1247fbd4: docs: Removed the -e runner subcommand option. Bug:
7562330
# Via Android Git Automerger (1) and quddusc (1)
* commit '
640d570d255988ed9942cda6df5f162328668437':
docs: Removed the -e runner subcommand option. Bug:
7562330
quddusc [Tue, 5 Feb 2013 20:29:08 +0000 (12:29 -0800)]
am
1247fbd4: docs: Removed the -e runner subcommand option. Bug:
7562330
# Via quddusc
* commit '
1247fbd43fc9d5492cb97d6313e851a6518ab4b8':
docs: Removed the -e runner subcommand option. Bug:
7562330
quddusc [Tue, 5 Feb 2013 19:37:46 +0000 (11:37 -0800)]
docs: Removed the -e runner subcommand option.
Bug:
7562330
Change-Id: I5fb7ee00583a8c25745796721ded8f6cba6f09ca
Robert Ly [Tue, 5 Feb 2013 18:20:42 +0000 (10:20 -0800)]
am
b23a35a3: am
ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
b23a35a3b9f44f3f673e9cacc3684d034414df27':
docs: update javadocs for gms and gcm
Robert Ly [Tue, 5 Feb 2013 18:15:57 +0000 (10:15 -0800)]
am
ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Robert Ly (1)
* commit '
ba84a04a2f98683f08cc7c73ec60341dc77d1eb9':
docs: update javadocs for gms and gcm
Robert Ly [Tue, 5 Feb 2013 18:12:38 +0000 (18:12 +0000)]
Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev
Robert Ly [Tue, 5 Feb 2013 02:24:15 +0000 (18:24 -0800)]
docs: update javadocs for gms and gcm
Change-Id: If5c80d3fac68a6351b652a19c199de1107ebd593
Scott Main [Mon, 4 Feb 2013 23:49:40 +0000 (15:49 -0800)]
am
83359e82: am
5439e0c2: docs: followup update for dashboard; add platform pie
# Via Android Git Automerger (1) and Scott Main (1)
* commit '
83359e824d35a4c8a91c73efadb6d1a537c521cc':
docs: followup update for dashboard; add platform pie
Scott Main [Mon, 4 Feb 2013 23:47:59 +0000 (15:47 -0800)]
am
5439e0c2: docs: followup update for dashboard; add platform pie
# Via Scott Main
* commit '
5439e0c2f7978a06c549f19531aee1ab2003fa35':
docs: followup update for dashboard; add platform pie
Scott Main [Mon, 4 Feb 2013 23:42:13 +0000 (15:42 -0800)]
docs: followup update for dashboard; add platform pie
Change-Id: I70b8d4e0384d995761a66afc34a66bcb03e5e74e
Scott Main [Mon, 4 Feb 2013 23:19:53 +0000 (15:19 -0800)]
am
641f74ae: am
dde4eedf: Merge "docs: update dashboard platform data for feb" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
641f74aefea7bd055307c22443839918438f6477':
docs: update dashboard platform data for feb
Scott Main [Mon, 4 Feb 2013 23:18:36 +0000 (15:18 -0800)]
am
dde4eedf: Merge "docs: update dashboard platform data for feb" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit '
dde4eedfb1b488fb02b2a54fb1c64f0a9ca70cfb':
docs: update dashboard platform data for feb
Scott Main [Mon, 4 Feb 2013 23:10:46 +0000 (23:10 +0000)]
Merge "docs: update dashboard platform data for feb" into jb-mr1-dev
Scott Main [Mon, 4 Feb 2013 22:02:48 +0000 (14:02 -0800)]
docs: update dashboard platform data for feb
Change-Id: Ie248bf69bcdca4434e53ab31a82a55fd9da4825b
Adam Powell [Mon, 4 Feb 2013 21:48:49 +0000 (13:48 -0800)]
am
67389e0a: Merge "Fix regression in expanded action view up" into jb-mr1.1-dev
# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit '
67389e0acec6877528c4cdaed99bf0a295bf74b9':
Fix regression in expanded action view up
Dirk Dougherty [Mon, 4 Feb 2013 21:45:05 +0000 (13:45 -0800)]
am
98ffd11c: am
26231572: Doc change: add redirects file (yaml) for use in devsite docs builds.
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '
98ffd11c25cb620872a0dd4421332c41309ac475':
Doc change: add redirects file (yaml) for use in devsite docs builds.
Adam Powell [Mon, 4 Feb 2013 21:43:15 +0000 (21:43 +0000)]
Merge "Fix regression in expanded action view up" into jb-mr1.1-dev
Dirk Dougherty [Mon, 4 Feb 2013 21:42:42 +0000 (13:42 -0800)]
am
26231572: Doc change: add redirects file (yaml) for use in devsite docs builds.
# Via Dirk Dougherty
* commit '
2623157244ae397fcaeecc46fab83a307b49b48f':
Doc change: add redirects file (yaml) for use in devsite docs builds.
Dirk Dougherty [Tue, 29 Jan 2013 04:34:17 +0000 (20:34 -0800)]
Doc change: add redirects file (yaml) for use in devsite docs builds.
Change-Id: I87d922bd4959c093544caf2addcb322ca7208fe8
Adam Powell [Mon, 4 Feb 2013 20:44:34 +0000 (12:44 -0800)]
Fix regression in expanded action view up
A bug was introduced when these views were restructured. Make sure that the
Up button for expanded action views functions/focuses correctly.
Bug
8124825
Change-Id: I0a886e62fca21dbb9a173db87642bb79ce9245e7
Dirk Dougherty [Fri, 1 Feb 2013 23:54:54 +0000 (15:54 -0800)]
am
3d57823a: am
8a72b6e0: Doc change: Remove more proto scheme from src urls (to fix mixed content warnings).
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '
3d57823a2e813ef9d535aab6c40ecbc509f5ab71':
Doc change: Remove more proto scheme from src urls (to fix mixed content warnings).
Dirk Dougherty [Fri, 1 Feb 2013 23:52:33 +0000 (15:52 -0800)]
am
8a72b6e0: Doc change: Remove more proto scheme from src urls (to fix mixed content warnings).
# Via Dirk Dougherty
* commit '
8a72b6e0db11dec73253b938defc2847a8c8234d':
Doc change: Remove more proto scheme from src urls (to fix mixed content warnings).
Dirk Dougherty [Fri, 1 Feb 2013 23:00:09 +0000 (15:00 -0800)]
Doc change: Remove more proto scheme from src urls (to fix mixed content warnings).
Change-Id: I1c2276f5fb057a0ca20c0d1feef2bce0ab7ffab8
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: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: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: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).
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)
OSDN Git Service
