OSDN Git Service
Daniel Sandler [Thu, 7 Feb 2013 06:01:39 +0000 (22:01 -0800)]
am
1a1e9b31: Merge "DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock"
# By Jorge Ruesga
# Via Gerrit Code Review (1) and Jorge Ruesga (1)
* commit '
1a1e9b317ac2d737ad92a35c4d806f0fda1ede70':
DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock
Jeffrey Brown [Thu, 7 Feb 2013 06:01:34 +0000 (22:01 -0800)]
am
d2bec096: Merge "NullPointerException in SQLiteSession"
# By László Dávid
# Via Gerrit Code Review (1) and László Dávid (1)
* commit '
d2bec0960d04578182905b34795c6895760944dd':
NullPointerException in SQLiteSession
Daniel Sandler [Thu, 7 Feb 2013 05:09:33 +0000 (05:09 +0000)]
Merge "DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock"
Jeffrey Brown [Thu, 7 Feb 2013 04:50:17 +0000 (20:50 -0800)]
am
b9185fd1: Merge "Fix PointerCoords Parcel incorrectly storing values as Int32"
# By Ilya Polenov
# Via Gerrit Code Review
* commit '
b9185fd1ffd85239e3ab10ab34cb9d8508970fb4':
Fix PointerCoords Parcel incorrectly storing values as Int32
Jeffrey Brown [Thu, 7 Feb 2013 04:50:13 +0000 (20:50 -0800)]
am
dac4a90d: Merge "fix hover events consume issue"
# By Masanori Ogino
# Via Gerrit Code Review (1) and Masanori Ogino (1)
* commit '
dac4a90d656dca86bd14cd91d685c07d8a6b29a4':
fix hover events consume issue
Jeffrey Brown [Thu, 7 Feb 2013 04:50:09 +0000 (20:50 -0800)]
am
88ba2f48: Merge "Disable usage of WAL in DatabaseHelper"
# By Yevgen Pronenko
# Via Gerrit Code Review (1) and Johan Redestig (1)
* commit '
88ba2f48a2d1193f3877575b2589897a7804aa75':
Disable usage of WAL in DatabaseHelper
Jeffrey Brown [Thu, 7 Feb 2013 04:50:04 +0000 (20:50 -0800)]
am
04ce0d25: Merge "Keep native callbacks when primary SQLiteConnection is recreated"
# By Niklas Brunlid
# Via Gerrit Code Review (1) and Johan Redestig (1)
* commit '
04ce0d253de9ec16f921824409a7b2c13195c19e':
Keep native callbacks when primary SQLiteConnection is recreated
Jeffrey Brown [Thu, 7 Feb 2013 04:50:00 +0000 (20:50 -0800)]
am
ea56499d: Merge "Potential NPE in SQLiteConnection"
# By Sylvain Becuwe
# Via Gerrit Code Review (1) and You Kim (1)
* commit '
ea56499dc36d863f92857ab7f93e5c4436f9654f':
Potential NPE in SQLiteConnection
Jeffrey Brown [Thu, 7 Feb 2013 04:49:54 +0000 (20:49 -0800)]
am
0d47af11: Merge "Clear loaders array after they are destroyed."
# By Roman Mazur
# Via Gerrit Code Review (1) and Roman Mazur (1)
* commit '
0d47af1131c4d4f9f29dad790d919d8599e3a3cc':
Clear loaders array after they are destroyed.
Jeffrey Brown [Thu, 7 Feb 2013 04:49:47 +0000 (20:49 -0800)]
am
af595a0f: Merge "Fix bugs regarding IllegalStateException during moving position in cursorwindow."
# By Jangwon Lee
# Via Gerrit Code Review (1) and git-lg-database.lge.com (1)
* commit '
af595a0f37643f12f32860fdea43fb67b74654b4':
Fix bugs regarding IllegalStateException during moving position in cursorwindow.
Jeffrey Brown [Thu, 7 Feb 2013 04:49:41 +0000 (20:49 -0800)]
am
b314f433: Merge "add reply.writeNoException() for quick response"
# By Sungmin Choi
# Via Gerrit Code Review (1) and Sungmin Choi (1)
* commit '
b314f433905ea2cbc62bd5af658f05261a752e5a':
add reply.writeNoException() for quick response
Jeffrey Brown [Thu, 7 Feb 2013 04:43:00 +0000 (04:43 +0000)]
Merge "NullPointerException in SQLiteSession"
Jeffrey Brown [Thu, 7 Feb 2013 04:42:31 +0000 (04:42 +0000)]
Merge "Fix PointerCoords Parcel incorrectly storing values as Int32"
Jeffrey Brown [Thu, 7 Feb 2013 04:40:30 +0000 (04:40 +0000)]
Merge "fix hover events consume issue"
Jeffrey Brown [Thu, 7 Feb 2013 04:39:35 +0000 (04:39 +0000)]
Merge "Disable usage of WAL in DatabaseHelper"
Jeffrey Brown [Thu, 7 Feb 2013 04:15:31 +0000 (04:15 +0000)]
Merge "Keep native callbacks when primary SQLiteConnection is recreated"
Jeffrey Brown [Thu, 7 Feb 2013 04:04:57 +0000 (04:04 +0000)]
Merge "Potential NPE in SQLiteConnection"
Jeffrey Brown [Thu, 7 Feb 2013 03:59:20 +0000 (03:59 +0000)]
Merge "Clear loaders array after they are destroyed."
Jeffrey Brown [Thu, 7 Feb 2013 03:48:22 +0000 (03:48 +0000)]
Merge "Fix bugs regarding IllegalStateException during moving position in cursorwindow."
Jeffrey Brown [Thu, 7 Feb 2013 03:46:47 +0000 (03:46 +0000)]
Merge "add reply.writeNoException() for quick response"
Adam Powell [Wed, 6 Feb 2013 22:58:41 +0000 (14:58 -0800)]
am
21af9a08: Merge "avoid multiple-"0" to exceed the length of upper bound"
# By Sungmin Choi
# Via Gerrit Code Review (1) and Sungmin Choi (1)
* commit '
21af9a08465c4927aab9db30efdfcf5ee8f52410':
avoid multiple-"0" to exceed the length of upper bound
Adam Powell [Wed, 6 Feb 2013 22:11:19 +0000 (22:11 +0000)]
Merge "avoid multiple-"0" to exceed the length of upper bound"
The Android Open Source Project [Wed, 6 Feb 2013 17:11:21 +0000 (09:11 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I3455d526f17f7dc7a6e00f9ea1e2612a5c541668
Adam Powell [Wed, 6 Feb 2013 00:54:45 +0000 (16:54 -0800)]
am
a7e028a9: am
cef582ab: am
07cf971e: Fix re-enabled state of up after action view collapse
# Via Android Git Automerger (2) and Adam Powell (1)
* commit '
a7e028a976c3f3692fa3c72f0ae11c01354e4c9a':
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
Adam Powell [Wed, 6 Feb 2013 00:53:04 +0000 (16:53 -0800)]
am
cef582ab: am
07cf971e: Fix re-enabled state of up after action view collapse
# Via Adam Powell (1) and Android Git Automerger (1)
* commit '
cef582ab0346afdaff9190565d432a9468ecdd7d':
Fix re-enabled state of up after action view collapse
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:26:29 +0000 (15:26 -0800)]
am
33fb8f63: am
dfa8d028: am
5e9be5bc: am
d6e0c147: Merge "docs: update auth doc to mention multiple scopes bug
7644251" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
33fb8f6309c553c809717694a84fe6564b19604f':
docs: update auth doc to mention multiple scopes bug
7644251
Robert Ly [Tue, 5 Feb 2013 23:24:30 +0000 (15:24 -0800)]
am
dfa8d028: am
5e9be5bc: am
d6e0c147: Merge "docs: update auth doc to mention multiple scopes bug
7644251" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
dfa8d02861ac2afb7addcb884b58dd009e2f212e':
docs: update auth doc to mention multiple scopes bug
7644251
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
Craig Mautner [Tue, 5 Feb 2013 22:26:28 +0000 (14:26 -0800)]
am
246a283c: am
fd5a0b36: Merge "Fix unexpected rotation change when re-enabling auto-rotate"
# By Sangkyu Lee
# Via Android Git Automerger (1) and others
* commit '
246a283c007e007181f8892df514dfe04121b7a5':
Fix unexpected rotation change when re-enabling auto-rotate
Craig Mautner [Tue, 5 Feb 2013 22:24:10 +0000 (14:24 -0800)]
am
fd5a0b36: Merge "Fix unexpected rotation change when re-enabling auto-rotate"
# By Sangkyu Lee
# Via Gerrit Code Review (1) and Sungmin Choi (1)
* commit '
fd5a0b3681499cbee0d1156b3b6f93fc91320848':
Fix unexpected rotation change when re-enabling auto-rotate
The Android Open Source Project [Tue, 5 Feb 2013 21:50:17 +0000 (13:50 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I7375c870961b812350a960b43344619cdd9ed8ea
Craig Mautner [Tue, 5 Feb 2013 21:31:10 +0000 (21:31 +0000)]
Merge "Fix unexpected rotation change when re-enabling auto-rotate"
quddusc [Tue, 5 Feb 2013 20:36:11 +0000 (12:36 -0800)]
am
77c6f8ee: am
a6a320ab: am
640d570d: am
1247fbd4: docs: Removed the -e runner subcommand option. Bug:
7562330
# Via Android Git Automerger (3) and quddusc (1)
* commit '
77c6f8ee22c66c829ea91740d178ff3323e1cb67':
docs: Removed the -e runner subcommand option. Bug:
7562330
quddusc [Tue, 5 Feb 2013 20:33:52 +0000 (12:33 -0800)]
am
a6a320ab: am
640d570d: am
1247fbd4: docs: Removed the -e runner subcommand option. Bug:
7562330
# Via Android Git Automerger (2) and quddusc (1)
* commit '
a6a320ab6699e17d22aea8fa21345e86cae0349c':
docs: Removed the -e runner subcommand option. Bug:
7562330
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
The Android Automerger [Tue, 5 Feb 2013 20:24:23 +0000 (12:24 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
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:23:04 +0000 (10:23 -0800)]
am
cb815699: am
00e9db5d: am
b23a35a3: am
ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
cb8156996a3bf5f75ea3dd7c289970bae32079ce':
docs: update javadocs for gms and gcm
Robert Ly [Tue, 5 Feb 2013 18:21:41 +0000 (10:21 -0800)]
am
00e9db5d: am
b23a35a3: am
ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
00e9db5d927e1c725665159f6b5c15e0c33a4c1b':
docs: update javadocs for gms and gcm
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
Kenny Root [Tue, 5 Feb 2013 01:37:34 +0000 (17:37 -0800)]
am
887c5236: am
74637db2: Merge "AndroidKeyStore: return error code on error"
# Via Android Git Automerger (1) and others
* commit '
887c523646012f4f0b63f5ffd0a1e9ebc3c2bdf1':
AndroidKeyStore: return error code on error
Kenny Root [Tue, 5 Feb 2013 01:35:35 +0000 (17:35 -0800)]
am
74637db2: Merge "AndroidKeyStore: return error code on error"
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '
74637db21eb0b3c0167378e2b5c866fdc02e51f2':
AndroidKeyStore: return error code on error
Kenny Root [Tue, 5 Feb 2013 00:20:46 +0000 (00:20 +0000)]
Merge "AndroidKeyStore: return error code on error"
Scott Main [Mon, 4 Feb 2013 23:58:51 +0000 (15:58 -0800)]
am
e218ac96: am
1dba73f6: am
83359e82: am
5439e0c2: docs: followup update for dashboard; add platform pie
# Via Android Git Automerger (3) and Scott Main (1)
* commit '
e218ac96f4b3229879256926595b080cc5266172':
docs: followup update for dashboard; add platform pie
Scott Main [Mon, 4 Feb 2013 23:51:44 +0000 (15:51 -0800)]
am
1dba73f6: am
83359e82: am
5439e0c2: docs: followup update for dashboard; add platform pie
# Via Android Git Automerger (2) and Scott Main (1)
* commit '
1dba73f64c60d25776c937be146a7880b85a193a':
docs: followup update for dashboard; add platform pie
Kenny Root [Mon, 4 Feb 2013 23:49:11 +0000 (15:49 -0800)]
AndroidKeyStore: return error code on error
Instead of blindly multiplying return value by 1000 to convert to
milliseconds, check to see if it's an error condition first.
Change-Id: I8eab1e7a86d78c13458fcbbc79d590e452fc9791
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:23:50 +0000 (15:23 -0800)]
am
a6404338: am
d042b849: am
641f74ae: am
dde4eedf: Merge "docs: update dashboard platform data for feb" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
a64043382309c60c86b48ad45e752f44a5a71ca1':
docs: update dashboard platform data for feb
Scott Main [Mon, 4 Feb 2013 23:22:06 +0000 (15:22 -0800)]
am
d042b849: am
641f74ae: am
dde4eedf: Merge "docs: update dashboard platform data for feb" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
d042b849df13e700f4b73dcec28220cafcc3a595':
docs: update dashboard platform data for feb
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
Kenny Root [Mon, 4 Feb 2013 23:12:04 +0000 (15:12 -0800)]
am
c4a768c8: am
5a720bb9: Merge "AndroidKeyStore: add key wrapping test"
# Via Android Git Automerger (1) and others
* commit '
c4a768c87e03a5e6d8b4435aaca6893546006321':
AndroidKeyStore: add key wrapping test
Kenny Root [Mon, 4 Feb 2013 23:12:01 +0000 (15:12 -0800)]
am
516fab24: am
133c5f5e: Merge "AndroidKeyStore: fix tests"
# Via Android Git Automerger (1) and others
* commit '
516fab2404f550aca03b3774bd5b279d4e69dd9f':
AndroidKeyStore: fix tests
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
Kenny Root [Mon, 4 Feb 2013 23:10:26 +0000 (15:10 -0800)]
am
5a720bb9: Merge "AndroidKeyStore: add key wrapping test"
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '
5a720bb9b031d44e593d2054bda586ccc3752aa4':
AndroidKeyStore: add key wrapping test
Kenny Root [Mon, 4 Feb 2013 23:10:22 +0000 (15:10 -0800)]
am
133c5f5e: Merge "AndroidKeyStore: fix tests"
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '
133c5f5e91e72cff1a9a3a4903a0efc96b39165b':
AndroidKeyStore: fix tests
Kenny Root [Mon, 4 Feb 2013 23:05:08 +0000 (23:05 +0000)]
Merge "AndroidKeyStore: add key wrapping test"
Kenny Root [Mon, 4 Feb 2013 23:01:01 +0000 (23:01 +0000)]
Merge "AndroidKeyStore: fix tests"
Kenny Root [Mon, 4 Feb 2013 22:47:36 +0000 (14:47 -0800)]
AndroidKeyStore: add key wrapping test
Change-Id: Ib21ab37d22689dd87f014eaa1f7919a575367cdd
Kenny Root [Mon, 4 Feb 2013 22:47:23 +0000 (14:47 -0800)]
AndroidKeyStore: fix tests
Change-Id: I65fd8ba27af57ea8fd27c8e08c9c1201f32c494d
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:54:56 +0000 (13:54 -0800)]
am
6a33c403: am
569f138e: am
67389e0a: Merge "Fix regression in expanded action view up" into jb-mr1.1-dev
# Via Android Git Automerger (2) and others
* commit '
6a33c4031de8f0b323855c6db8d6ee0c812b0f00':
Fix regression in expanded action view up
Adam Powell [Mon, 4 Feb 2013 21:53:24 +0000 (13:53 -0800)]
am
569f138e: am
67389e0a: Merge "Fix regression in expanded action view up" into jb-mr1.1-dev
# Via Adam Powell (1) and others
* commit '
569f138ef1a94e6d6cfc0587f06b396a77f00c1c':
Fix regression in expanded action view up
Dirk Dougherty [Mon, 4 Feb 2013 21:49:14 +0000 (13:49 -0800)]
am
59abf4ae: am
db3ace21: am
98ffd11c: am
26231572: Doc change: add redirects file (yaml) for use in devsite docs builds.
# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit '
59abf4ae5772349c306ae38792ef651ea845c9c7':
Doc change: add redirects file (yaml) for use in devsite docs builds.
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:47:16 +0000 (13:47 -0800)]
am
db3ace21: am
98ffd11c: am
26231572: Doc change: add redirects file (yaml) for use in devsite docs builds.
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit '
db3ace21268ff06b4ebc8733cc8ed3ae9e3091ec':
Doc change: add redirects file (yaml) for use in devsite docs builds.
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
Kenny Root [Mon, 4 Feb 2013 19:44:53 +0000 (11:44 -0800)]
am
ace72f6a: Merge "Function uri.getAuthority is called twice. Minor doc corrections."
# By Yury Zhauniarovich
# Via Gerrit Code Review
* commit '
ace72f6a37ffc232172346b3385494ef10195583':
Function uri.getAuthority is called twice. Minor doc corrections.
Kenny Root [Mon, 4 Feb 2013 19:21:25 +0000 (19:21 +0000)]
Merge "Function uri.getAuthority is called twice. Minor doc corrections."
Irfan Sheriff [Mon, 4 Feb 2013 18:34:21 +0000 (10:34 -0800)]
am
ac20bf1f: am
43a601e7: Merge "Change default intent"
# Via Android Git Automerger (1) and others
* commit '
ac20bf1fcda9210640fd8e4d71b0644a2b012658':
Change default intent
Irfan Sheriff [Mon, 4 Feb 2013 18:32:11 +0000 (10:32 -0800)]
am
43a601e7: Merge "Change default intent"
# Via Gerrit Code Review (1) and Irfan Sheriff (1)
* commit '
43a601e76966ae1d4af5b1117c10f0479a5f97cd':
Change default intent
Irfan Sheriff [Mon, 4 Feb 2013 18:09:27 +0000 (18:09 +0000)]
Merge "Change default intent"
Irfan Sheriff [Mon, 4 Feb 2013 17:37:07 +0000 (09:37 -0800)]
Change default intent
Older JB releases have a bug handling persistence invocation. One work
around right now is to have the newer release (with persistence)
use a lower intent value to allow older release to operate in group
owner mode.
Change-Id: I7ffb66081a352929a6f421e5d6141f592be7d472
Dirk Dougherty [Mon, 4 Feb 2013 17:07:50 +0000 (09:07 -0800)]
am
6602ade6: am
ed1c148d: am
3d57823a: am
8a72b6e0: Doc change: Remove more proto scheme from src urls (to fix mixed content warnings).
# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit '
6602ade615ce5ad206722b3c3ffac955078a9cc7':
Doc change: Remove more proto scheme from src urls (to fix mixed content warnings).
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
OSDN Git Service
