Mark Goldstein
b354b01acf
Merge "docs: Fix typo" into nyc-dev am: 8d660eebad
...
am: e24079f5b2
2016-08-25 23:56:49 +00:00
Mark Goldstein
60a849ab32
docs: Fix typo am: 1c22ae296b
...
am: b348093ec4
2016-08-25 23:56:45 +00:00
Mark Goldstein
e24079f5b2
Merge "docs: Fix typo" into nyc-dev
...
am: 8d660eebad
2016-08-25 23:48:49 +00:00
Mark Goldstein
b348093ec4
docs: Fix typo
...
am: 1c22ae296b
2016-08-25 23:48:46 +00:00
Mark Goldstein
8d660eebad
Merge "docs: Fix typo" into nyc-dev
2016-08-25 23:40:43 +00:00
Narayan Kamath
36b9c90299
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e am: a21569cd76 am: b0429bbad5 am: 1238ffcd2c
...
am: 22585d75f9
2016-08-25 23:39:59 +00:00
Narayan Kamath
22585d75f9
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e am: a21569cd76 am: b0429bbad5
...
am: 1238ffcd2c
2016-08-25 23:35:41 +00:00
Narayan Kamath
1238ffcd2c
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e am: a21569cd76
...
am: b0429bbad5
2016-08-25 23:29:29 +00:00
Narayan Kamath
b0429bbad5
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e
...
am: a21569cd76
2016-08-25 23:21:09 +00:00
Svetoslav Ganov
6f1955bf23
Merge "Fix a regression in sync manager" into nyc-mr1-dev
2016-08-25 23:14:23 +00:00
Narayan Kamath
a21569cd76
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624
...
am: 8f4f9e4d5e
2016-08-25 23:13:51 +00:00
Narayan Kamath
8f4f9e4d5e
resolve merge conflicts of 5191225 to mnc-dev
...
am: 1fbc4b8624
2016-08-25 23:08:25 +00:00
Pankaj Kanwar
a65318a290
Merge "Show a toast when switching from wifi to Verizon cell data." into nyc-dr1-dev
...
am: 5d06597072
2016-08-25 22:53:36 +00:00
Lorenzo Colitti
88d4d15d52
Show a toast when switching from wifi to Verizon cell data.
...
am: efe0839876
2016-08-25 22:53:31 +00:00
Svet Ganov
dfed1c73ec
Fix a regression in sync manager
...
A previous change introduced the regression that we don't let
initialization syncs run - this reverts the original logic.
bug:31056110
Change-Id: I4382af1284a3296c63ab773aa4a52df01deeb853
2016-08-25 22:48:17 +00:00
Pankaj Kanwar
5d06597072
Merge "Show a toast when switching from wifi to Verizon cell data." into nyc-dr1-dev
2016-08-25 22:34:22 +00:00
Dianne Hackborn
22ad9a3116
Merge "Try to mitigate issue #31016187 : system_server crash in ArraySet." into nyc-dev am: 184edd6d93
...
am: 90a6799951
2016-08-25 22:17:31 +00:00
Dianne Hackborn
2eb6e503ea
Try to mitigate issue #31016187 : system_server crash in ArraySet. am: dd28b7b5f3
...
am: 05775d71e6
2016-08-25 22:14:27 +00:00
Mark Lu
794b9dd366
Merge "docs: rewrite one attribute description in R.attr" into nyc-dev am: 30cba33a60
...
am: 40f25f1464
2016-08-25 22:14:23 +00:00
Mark Lu
77d7db4de1
docs: rewrite one attribute description in R.attr am: 5dabf06ae5
...
am: 6df44a80a3
2016-08-25 22:14:19 +00:00
Mark Lu
7c71a2fa10
Merge "docs: fix broken links in Activity reference" into nyc-dev am: d428a012ba
...
am: 5c83071228
2016-08-25 22:14:17 +00:00
Mark Lu
eab610d0a6
docs: fix broken links in Activity reference am: fa43485910
...
am: 497c2907fd
2016-08-25 22:14:14 +00:00
Mark Lu
d478856ca8
Merge "docs: fix code snippets in SQL Databases page" into nyc-dev am: 209fb02f84
...
am: f858ebf9db
2016-08-25 22:10:57 +00:00
Mark Lu
da8624a129
docs: fix code snippets in SQL Databases page am: 95698f127a
...
am: 6f5cf3fb0d
2016-08-25 22:10:53 +00:00
Hemal Patel
42708fa473
Docs: Fixed the Bluetooth guide link am: 65813dff14 am: a544221abd
...
am: d6a64d788b
2016-08-25 22:10:49 +00:00
Andrew Solovay
911c2ce9a7
docs: Removing non-English /preview/ directories am: 2d629c3e5b
...
am: 847b2a4a95
2016-08-25 22:10:46 +00:00
Chris Tate
9ff115c3c5
Merge "Properly configure live wallpaper selection following restore" into nyc-dr1-dev
...
am: 9141666630
2016-08-25 22:10:43 +00:00
Christopher Tate
7f97482766
Properly configure live wallpaper selection following restore
...
am: 2471a3724f
2016-08-25 22:10:41 +00:00
Dianne Hackborn
90a6799951
Merge "Try to mitigate issue #31016187 : system_server crash in ArraySet." into nyc-dev
...
am: 184edd6d93
2016-08-25 21:55:03 +00:00
Dianne Hackborn
05775d71e6
Try to mitigate issue #31016187 : system_server crash in ArraySet.
...
am: dd28b7b5f3
2016-08-25 21:55:01 +00:00
Mark Lu
40f25f1464
Merge "docs: rewrite one attribute description in R.attr" into nyc-dev
...
am: 30cba33a60
2016-08-25 21:54:56 +00:00
Mark Lu
6df44a80a3
docs: rewrite one attribute description in R.attr
...
am: 5dabf06ae5
2016-08-25 21:54:54 +00:00
Mark Lu
5c83071228
Merge "docs: fix broken links in Activity reference" into nyc-dev
...
am: d428a012ba
2016-08-25 21:54:51 +00:00
Mark Lu
497c2907fd
docs: fix broken links in Activity reference
...
am: fa43485910
2016-08-25 21:54:49 +00:00
Mark Lu
f858ebf9db
Merge "docs: fix code snippets in SQL Databases page" into nyc-dev
...
am: 209fb02f84
2016-08-25 21:54:44 +00:00
Mark Lu
6f5cf3fb0d
docs: fix code snippets in SQL Databases page
...
am: 95698f127a
2016-08-25 21:54:42 +00:00
TreeHugger Robot
184edd6d93
Merge "Try to mitigate issue #31016187 : system_server crash in ArraySet." into nyc-dev
2016-08-25 21:38:45 +00:00
Hemal Patel
d6a64d788b
Docs: Fixed the Bluetooth guide link am: 65813dff14
...
am: a544221abd
2016-08-25 21:37:59 +00:00
Andrew Solovay
847b2a4a95
docs: Removing non-English /preview/ directories
...
am: 2d629c3e5b
2016-08-25 21:37:57 +00:00
Mark Lu
30cba33a60
Merge "docs: rewrite one attribute description in R.attr" into nyc-dev
2016-08-25 21:34:04 +00:00
Mark Lu
d428a012ba
Merge "docs: fix broken links in Activity reference" into nyc-dev
2016-08-25 21:33:31 +00:00
Mark Lu
209fb02f84
Merge "docs: fix code snippets in SQL Databases page" into nyc-dev
2016-08-25 21:33:26 +00:00
Hemal Patel
a544221abd
Docs: Fixed the Bluetooth guide link
...
am: 65813dff14
2016-08-25 21:31:56 +00:00
Chris Tate
9141666630
Merge "Properly configure live wallpaper selection following restore" into nyc-dr1-dev
2016-08-25 20:58:09 +00:00
Dianne Hackborn
dd28b7b5f3
Try to mitigate issue #31016187 : system_server crash in ArraySet.
...
Instead of crashing, log a wtf and recover. This is not a problem
in ArraySet, but caused by someone else using an ArraySet without
protecting access to it. So whoever is calling at this point is
not the cause, and it isn't worthwhile to let them crash.
Change-Id: Iaefa4315b620c9fe24b31507e4aa47a8525c8540
(cherry picked from commit 92aa4b2ba3
2016-08-25 19:49:41 +00:00
Mark Goldstein
1c22ae296b
docs: Fix typo
...
Bug: 25777114
Change-Id: I5c34ceba8f3b76bd47e1c020956cef285bad59d7
2016-08-25 12:48:07 -07:00
Andrew Solovay
2d629c3e5b
docs: Removing non-English /preview/ directories
...
The remaining docs in the [language]/preview directories were
causing devsite publish to fail (they refer to files that no longer
exist). Removing all those directories; redirects are already set up.
See first comment for doc stage location.
Change-Id: Ic22652d44696ec2647586e19aa61627d40232239
2016-08-25 12:36:36 -07:00
Tenghui Zhu
1e37cc2f8a
Merge "Add TestApi to ValueAnimator for AnimationScaleListDrawable CTS test." into nyc-mr1-dev
2016-08-25 18:24:12 +00:00
Phil Weaver
1bb2cc8cc3
Merge "Revert "Dispatch a11y events in separate thread."" into nyc-mr1-dev
2016-08-25 18:05:36 +00:00
Phil Weaver
a71239203f
Merge "Fix crash when user changes after a11yservice dies" into nyc-mr1-dev
2016-08-25 17:59:20 +00:00
