Sudheer Shanka
7a46fac0cd
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3
...
am: 203d1bee25
2016-08-25 23:30:05 +00:00
Sudheer Shanka
71933abbdc
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab
...
am: c35a9fed39
2016-08-25 23:30:03 +00:00
Amith Yamasani
7586e03e06
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41
...
am: f6361752ca
2016-08-25 23:29:59 +00:00
Sudheer Shanka
bc5775c18b
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb am: 2490679d7e
...
am: 2f664374fa
2016-08-25 23:29:56 +00:00
Amith Yamasani
a106b52180
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d am: 1d513c845a
...
am: 5eed3c9c38
2016-08-25 23:29:52 +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
Sudheer Shanka
203d1bee25
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c
...
am: 77dec89bb3
2016-08-25 23:22:19 +00:00
Sudheer Shanka
c35a9fed39
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4
...
am: 97194798ab
2016-08-25 23:22:14 +00:00
Amith Yamasani
f6361752ca
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e
...
am: 75c7391a41
2016-08-25 23:22:10 +00:00
Sudheer Shanka
2f664374fa
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours am: 86ac88ccdb
...
am: 2490679d7e
2016-08-25 23:22:04 +00:00
Amith Yamasani
5eed3c9c38
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours am: 368ae62e9d
...
am: 1d513c845a
2016-08-25 23:22:00 +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
166d67b769
Merge "Fix a regression in sync manager" into nyc-mr1-dev
...
am: 6f1955bf23
2016-08-25 23:21:05 +00:00
Svet Ganov
a09f3790ac
Fix a regression in sync manager
...
am: dfed1c73ec
2016-08-25 23:20:58 +00:00
Pankaj Kanwar
64145a519a
Merge "Show a toast when switching from wifi to Verizon cell data." into nyc-dr1-dev am: 5d06597072
...
am: a65318a290
2016-08-25 23:20:51 +00:00
Lorenzo Colitti
b9aa287404
Show a toast when switching from wifi to Verizon cell data. am: efe0839876
...
am: 88d4d15d52
2016-08-25 23:20:48 +00:00
Svetoslav Ganov
6f1955bf23
Merge "Fix a regression in sync manager" into nyc-mr1-dev
2016-08-25 23:14:23 +00:00
Sudheer Shanka
77dec89bb3
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3
...
am: c2a760e68c
2016-08-25 23:14:09 +00:00
Sudheer Shanka
97194798ab
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours
...
am: 603a69ffb4
2016-08-25 23:14:06 +00:00
Amith Yamasani
75c7391a41
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours
...
am: 9080d4462e
2016-08-25 23:14:04 +00:00
Sudheer Shanka
2490679d7e
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c -s ours
...
am: 86ac88ccdb
2016-08-25 23:14:01 +00:00
Amith Yamasani
1d513c845a
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours
...
am: 368ae62e9d
2016-08-25 23:13:58 +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
Sudheer Shanka
c2a760e68c
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58
...
am: cdf70ba0a3
2016-08-25 23:07:56 +00:00
Sudheer Shanka
603a69ffb4
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288
...
am: dfc2d0a4bc
2016-08-25 23:07:53 +00:00
Amith Yamasani
9080d4462e
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec
...
am: 7b8140652b
2016-08-25 23:07:51 +00:00
Sudheer Shanka
86ac88ccdb
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6
...
am: 26bb7bf86c
2016-08-25 23:07:49 +00:00
Amith Yamasani
368ae62e9d
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0
...
am: 117a383099
2016-08-25 23:07:46 +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
Dianne Hackborn
4ddb8760b2
Merge "Try to mitigate issue #31016187 : system_server crash in ArraySet." into nyc-dev am: 184edd6d93 am: 90a6799951
...
am: 22ad9a3116
2016-08-25 22:43:44 +00:00
Dianne Hackborn
4587f8b4db
Try to mitigate issue #31016187 : system_server crash in ArraySet. am: dd28b7b5f3 am: 05775d71e6
...
am: 2eb6e503ea
2016-08-25 22:43:42 +00:00
Mark Lu
ccd487a98e
Merge "docs: rewrite one attribute description in R.attr" into nyc-dev am: 30cba33a60 am: 40f25f1464
...
am: 794b9dd366
2016-08-25 22:34:31 +00:00
Mark Lu
e4daddf599
docs: rewrite one attribute description in R.attr am: 5dabf06ae5 am: 6df44a80a3
...
am: 77d7db4de1
2016-08-25 22:34:27 +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
Mark Lu
1f3ded459b
Merge "docs: fix broken links in Activity reference" into nyc-dev am: d428a012ba am: 5c83071228
...
am: 7c71a2fa10
2016-08-25 22:34:22 +00:00
Mark Lu
b03a1b8b25
docs: fix broken links in Activity reference am: fa43485910 am: 497c2907fd
...
am: eab610d0a6
2016-08-25 22:34:20 +00:00
Mark Lu
6bd5be87fb
Merge "docs: fix code snippets in SQL Databases page" into nyc-dev am: 209fb02f84 am: f858ebf9db
...
am: d478856ca8
2016-08-25 22:34:17 +00:00
Mark Lu
43c71f3988
docs: fix code snippets in SQL Databases page am: 95698f127a am: 6f5cf3fb0d
...
am: da8624a129
2016-08-25 22:31:16 +00:00
Hemal Patel
ac438b21ba
Docs: Fixed the Bluetooth guide link am: 65813dff14 am: a544221abd am: d6a64d788b
...
am: 42708fa473
2016-08-25 22:31:14 +00:00
Andrew Solovay
8b48f0baab
docs: Removing non-English /preview/ directories am: 2d629c3e5b am: 847b2a4a95
...
am: 911c2ce9a7
2016-08-25 22:31:12 +00:00
Chris Tate
5065068d3f
Merge "Properly configure live wallpaper selection following restore" into nyc-dr1-dev am: 9141666630
...
am: 9ff115c3c5
2016-08-25 22:31:10 +00:00
Christopher Tate
d7e988e99e
Properly configure live wallpaper selection following restore am: 2471a3724f
...
am: 7f97482766
2016-08-25 22:31:07 +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
