OSDN Git Service
Mark Lu [Tue, 30 Aug 2016 01:20:30 +0000 (01:20 +0000)]
docs: Fix typo and broken link in AsyncTask.java am:
53415ff24e am:
bae52ec98c am:
86caa4aebf am:
b48098f836
am:
5f43a76d5e
Change-Id: I6f169738940f9de5819ca6cf98ecbd23b5d7040f
Winson Chung [Tue, 30 Aug 2016 01:20:21 +0000 (01:20 +0000)]
Merge "Fixing typo in dump log." into nyc-mr1-dev am:
5ebd73f8ff am:
ba4744bc08
am:
d79fc544e6
Change-Id: If9eb7b38c50d11fc046affe10002524c5476ea48
Winson [Tue, 30 Aug 2016 01:20:12 +0000 (01:20 +0000)]
Fixing typo in dump log. am:
b43ba86811 am:
1de1a3bfcc
am:
fc4a87580f
Change-Id: Id813187a627f795627a491cfe736f6e70d3e318a
Mark Lu [Tue, 30 Aug 2016 01:20:00 +0000 (01:20 +0000)]
Merge "docs: fix link in Loader reference page" into nyc-dev am:
3c638c1ea1 am:
ceaef72fb9 am:
a5f090a768 am:
975704a737
am:
233e745bf6
Change-Id: I16b65a1ec53404db02a6d30426cd6636b226b49a
Mark Lu [Tue, 30 Aug 2016 01:11:58 +0000 (01:11 +0000)]
docs: fix link in Loader reference page am:
9f52b7a4a8 am:
f496b9a981 am:
e16c82d224 am:
bfe0c86461
am:
45be550f69
Change-Id: I690f5655ec8a787d75f5bd86ba2df21e342ed9a8
Suprabh Shukla [Tue, 30 Aug 2016 01:11:50 +0000 (01:11 +0000)]
Merge "Resolving race condition while writing recent taskids" into nyc-mr1-dev am:
769bc6c8b1 am:
9dbdbf461e
am:
29ac4b3f25
Change-Id: I7f55d2e0a89633283adb9cbb9b604473bb2cc781
Suprabh Shukla [Tue, 30 Aug 2016 01:11:43 +0000 (01:11 +0000)]
Resolving race condition while writing recent taskids am:
fd0bd4f39d am:
c9e7c49def
am:
e59b5664ab
Change-Id: I0a603cc99a2901147a65ded2b54e28d3545ff851
Sudheer Shanka [Tue, 30 Aug 2016 01:11:37 +0000 (01:11 +0000)]
Merge "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 am:
7a46fac0cd" into nyc-dev am:
fea9feb30e am:
c3a6dbd46e am:
5d146ccdb8 am:
1167bcf2c9
am:
17636dac49
Change-Id: Idde167a3ce569954472fc8ebd03ad6a15088e634
Sudheer Shanka [Tue, 30 Aug 2016 01:11:34 +0000 (01:11 +0000)]
Merge "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 am:
7a46fac0cd am:
d57565864b am:
c18b88c15d am:
1c153c697b am:
20e7a6b448" into nyc-mr1-dev-plus-aosp
am:
cdaa07edc8
Change-Id: I4739d530849929d606e102df74d34996e5018190
Sudheer Shanka [Tue, 30 Aug 2016 01:11:29 +0000 (01:11 +0000)]
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 am:
7a46fac0cd am:
d57565864b am:
c18b88c15d am:
1c153c697b am:
20e7a6b448
am:
80cbe5bc76
Change-Id: I99b2f17a800c714e36aa8a2840c7e1c7c0063dbc
Sudheer Shanka [Tue, 30 Aug 2016 01:05:40 +0000 (01:05 +0000)]
Merge "Merge "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 am:
71933abbdc -s ours" into nyc-dev am:
cca29c7284 am:
2ea71d8c64 am:
2c18f32328 am:
7a50c5afd2" into nyc-mr1-dev-plus-aosp
am:
e16ae22718 -s ours
Change-Id: I4b6612d1abd513bb8ddc4ae1005bfbe9b18f24bb
Sudheer Shanka [Tue, 30 Aug 2016 01:05:37 +0000 (01:05 +0000)]
Merge "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 am:
71933abbdc -s ours" into nyc-dev am:
cca29c7284 am:
2ea71d8c64 am:
2c18f32328 am:
7a50c5afd2
am:
d1f79e54e1 -s ours
Change-Id: I64c762bd9f94b0b271a20bbcc2e532541bb963f0
Sudheer Shanka [Tue, 30 Aug 2016 01:05:20 +0000 (01:05 +0000)]
Merge "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 am:
71933abbdc -s ours am:
02ba5ef875 am:
26fa4042e1 am:
c16baae14f am:
c44432439f" into nyc-mr1-dev-plus-aosp
am:
2360e2a8c0 -s ours
Change-Id: If80948de9d7b7a1dd9e5283e5333e9dc9f9f1641
Sudheer Shanka [Tue, 30 Aug 2016 01:05:17 +0000 (01:05 +0000)]
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 am:
71933abbdc -s ours am:
02ba5ef875 am:
26fa4042e1 am:
c16baae14f am:
c44432439f
am:
b1b4527845 -s ours
Change-Id: I82ac9193e47a5b3b3afbbca5fb7e9f5a7655dd7b
Amith Yamasani [Tue, 30 Aug 2016 01:05:00 +0000 (01:05 +0000)]
Merge "Merge "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 am:
7586e03e06 -s ours" into nyc-dev am:
5f5403def8 am:
d8ffc6239b am:
710c5ea5a6 am:
586fa0cefd" into nyc-mr1-dev-plus-aosp
am:
e98758067c -s ours
Change-Id: Ia7427b2aa66c0b19e2d662d60004f9909e8618b6
Amith Yamasani [Tue, 30 Aug 2016 01:04:54 +0000 (01:04 +0000)]
Merge "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 am:
7586e03e06 -s ours" into nyc-dev am:
5f5403def8 am:
d8ffc6239b am:
710c5ea5a6 am:
586fa0cefd
am:
ca6c0df734 -s ours
Change-Id: I23912c855ccf7ba59373f241701e508bbe6d6c57
Amith Yamasani [Tue, 30 Aug 2016 01:04:13 +0000 (01:04 +0000)]
Merge "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 am:
7586e03e06 -s ours am:
4a3caefd6c am:
f7259775d8 am:
216e40b926 am:
3025752705" into nyc-mr1-dev-plus-aosp
am:
e9d9c2eafa -s ours
Change-Id: Ib60d904f1fe0a000f3546a9f4e3c0d1ad2592e25
Amith Yamasani [Tue, 30 Aug 2016 01:04:04 +0000 (01:04 +0000)]
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 am:
7586e03e06 -s ours am:
4a3caefd6c am:
f7259775d8 am:
216e40b926 am:
3025752705
am:
663724bed8 -s ours
Change-Id: I977b96b9c5993e68cf4283d42fd54cbac8bfbbd6
Sudheer Shanka [Tue, 30 Aug 2016 01:03:37 +0000 (01:03 +0000)]
Merge "Merge "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 am:
bc5775c18b -s ours" into nyc-dev am:
555fbf30d2 am:
12a668fde8 am:
148acfcb45 am:
cb6f2eeb33" into nyc-mr1-dev-plus-aosp
am:
31b56a62a0 -s ours
Change-Id: I73724da6fb5033188c86a2dee4cbdab487981659
Sudheer Shanka [Tue, 30 Aug 2016 01:03:33 +0000 (01:03 +0000)]
Merge "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 am:
bc5775c18b -s ours" into nyc-dev am:
555fbf30d2 am:
12a668fde8 am:
148acfcb45 am:
cb6f2eeb33
am:
035d0cfd74 -s ours
Change-Id: I7dbc1f67a3580b0e71cae083f5ab9186537deecc
Sudheer Shanka [Tue, 30 Aug 2016 00:55:06 +0000 (00:55 +0000)]
Merge "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 am:
bc5775c18b -s ours am:
6a9490f850 am:
380d9b9486 am:
ea35f92f98 am:
d5be8af093" into nyc-mr1-dev-plus-aosp
am:
f5b9d2c881 -s ours
Change-Id: Id3330d1ed4ad5779eb5694f409bad67a3da69952
Sudheer Shanka [Tue, 30 Aug 2016 00:55:02 +0000 (00:55 +0000)]
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 am:
bc5775c18b -s ours am:
6a9490f850 am:
380d9b9486 am:
ea35f92f98 am:
d5be8af093
am:
6eaa44141c -s ours
Change-Id: I2e68f4687256293d382cc9ce47e77b1e8cad4cce
Amith Yamasani [Tue, 30 Aug 2016 00:54:46 +0000 (00:54 +0000)]
Merge "Merge "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 am:
a106b52180 -s ours" into nyc-dev am:
4ee46e5b99 am:
fda97bed8d am:
af4f11bdf6 am:
e18ec512c6" into nyc-mr1-dev-plus-aosp
am:
9e2f76cac3 -s ours
Change-Id: Ie327388f9c0d230c16d03a4356c2b40a5133fd21
Amith Yamasani [Tue, 30 Aug 2016 00:54:43 +0000 (00:54 +0000)]
Merge "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 am:
a106b52180 -s ours" into nyc-dev am:
4ee46e5b99 am:
fda97bed8d am:
af4f11bdf6 am:
e18ec512c6
am:
812e355289 -s ours
Change-Id: I1be74b423bff90adaa614a333a8cd2fc67987569
Amith Yamasani [Tue, 30 Aug 2016 00:54:27 +0000 (00:54 +0000)]
Merge "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 am:
a106b52180 -s ours am:
b6cc1acb63 am:
b6813f24ae am:
1c6048e697 am:
995980b3a1" into nyc-mr1-dev-plus-aosp
am:
a7f7c3c90b -s ours
Change-Id: I590aa1a19e9d094ff8fbf398acf9d05ef04be132
Amith Yamasani [Tue, 30 Aug 2016 00:54:24 +0000 (00:54 +0000)]
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 am:
a106b52180 -s ours am:
b6cc1acb63 am:
b6813f24ae am:
1c6048e697 am:
995980b3a1
am:
0d6d53470c -s ours
Change-Id: I65851365f8088c09e44acf3d61c80e567dbb5b43
Mark Goldstein [Tue, 30 Aug 2016 00:54:03 +0000 (00:54 +0000)]
Merge "Merge "docs: Fix typo" into nyc-dev am:
8d660eebad am:
e24079f5b2 am:
b354b01acf am:
0f91a8a84e" into nyc-mr1-dev-plus-aosp
am:
ca0a0c8766
Change-Id: Ifa2072d0378880b0c0799ed6eecd5459511729aa
Mark Goldstein [Tue, 30 Aug 2016 00:53:55 +0000 (00:53 +0000)]
Merge "docs: Fix typo" into nyc-dev am:
8d660eebad am:
e24079f5b2 am:
b354b01acf am:
0f91a8a84e
am:
0ef8a8dbce
Change-Id: I07c2cbbd805b8f570fa1bd1fa902444786af28af
Mark Lu [Tue, 30 Aug 2016 00:53:22 +0000 (00:53 +0000)]
Merge "Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev am:
314d995ca1 am:
c9fbef739f" into nyc-mr1-dev-plus-aosp
am:
4d30398a62
Change-Id: Ie8d08a2dacc00c196760d29ce2d712e0e5444fdd
Mark Lu [Tue, 30 Aug 2016 00:53:09 +0000 (00:53 +0000)]
Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev am:
314d995ca1 am:
c9fbef739f
am:
dcdb153d57
Change-Id: I8afff7bd6813aa94b4738f44f3f458cc0039692c
Mark Lu [Tue, 30 Aug 2016 00:44:00 +0000 (00:44 +0000)]
Merge "docs: Fix typo and broken link in AsyncTask.java am:
53415ff24e am:
fc68813e5c" into nyc-mr1-dev-plus-aosp
am:
6727a1ae53
Change-Id: I5958e9f339073de5d6cfec75430fbe432a24de16
Mark Lu [Tue, 30 Aug 2016 00:43:55 +0000 (00:43 +0000)]
docs: Fix typo and broken link in AsyncTask.java am:
53415ff24e am:
fc68813e5c
am:
f9537d2a05
Change-Id: Icbd832031e6c3dea5fca8b7984a3c1bc1decd210
Mark Lu [Tue, 30 Aug 2016 00:43:47 +0000 (00:43 +0000)]
Merge "Merge "docs: fix link in Loader reference page" into nyc-dev am:
3c638c1ea1 am:
09e4d9bada" into nyc-mr1-dev-plus-aosp
am:
d4f152b922
Change-Id: Ie160cc9531c3facd954e6c6790673b406046c70b
Mark Lu [Tue, 30 Aug 2016 00:43:44 +0000 (00:43 +0000)]
Merge "docs: fix link in Loader reference page" into nyc-dev am:
3c638c1ea1 am:
09e4d9bada
am:
7a49cf768a
Change-Id: I1587f17cdcf85742b324027744929603ecb5a557
Mark Lu [Tue, 30 Aug 2016 00:43:32 +0000 (00:43 +0000)]
Merge "docs: fix link in Loader reference page am:
9f52b7a4a8 am:
c6612637bb" into nyc-mr1-dev-plus-aosp
am:
0c8a12a063
Change-Id: I06cdc4844d35e31361f1337b7d859f7003085e22
Mark Lu [Tue, 30 Aug 2016 00:43:26 +0000 (00:43 +0000)]
docs: fix link in Loader reference page am:
9f52b7a4a8 am:
c6612637bb
am:
2721e7db4a
Change-Id: Ic5976080ef14387a59914d05be38ecbabf86e332
Sudheer Shanka [Tue, 30 Aug 2016 00:43:05 +0000 (00:43 +0000)]
Merge "Merge "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 am:
7a46fac0cd" into nyc-dev am:
fea9feb30e am:
fb3c06f8d1" into nyc-mr1-dev-plus-aosp
am:
730466784b
Change-Id: Icd8ecd994da082b6bb63aed5eed0963386174df3
Sudheer Shanka [Tue, 30 Aug 2016 00:42:53 +0000 (00:42 +0000)]
Merge "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 am:
7a46fac0cd" into nyc-dev am:
fea9feb30e am:
fb3c06f8d1
am:
75de65321b
Change-Id: Ic1ecbcdc16207fae2c1482b093969a317f7f0cd5
Sudheer Shanka [Tue, 30 Aug 2016 00:42:16 +0000 (00:42 +0000)]
Merge "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 am:
7a46fac0cd am:
d57565864b am:
80ce19c380" into nyc-mr1-dev-plus-aosp
am:
986b447633
Change-Id: I42192fff18a60b582f68bfa0e4c378ba34d7d128
Sudheer Shanka [Tue, 30 Aug 2016 00:42:12 +0000 (00:42 +0000)]
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 am:
7a46fac0cd am:
d57565864b am:
80ce19c380
am:
42cc00c5d9
Change-Id: Ie3ec8c09ff69d1856fb2297109181a36f4b302b9
Sudheer Shanka [Tue, 30 Aug 2016 00:20:40 +0000 (00:20 +0000)]
Merge "Merge "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 am:
71933abbdc -s ours" into nyc-dev am:
cca29c7284 am:
7c17f2ee60" into nyc-mr1-dev-plus-aosp
am:
515916a51d -s ours
Change-Id: I8334234d7f35ab799fb499fe5f4d4cfc6dbbf2db
Sudheer Shanka [Tue, 30 Aug 2016 00:20:38 +0000 (00:20 +0000)]
Merge "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 am:
71933abbdc -s ours" into nyc-dev am:
cca29c7284 am:
7c17f2ee60
am:
b8dde176db -s ours
Change-Id: Ieeaabc1be1397a89c98e45d86209dcd4472805c3
Sudheer Shanka [Tue, 30 Aug 2016 00:20:13 +0000 (00:20 +0000)]
Merge "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 am:
71933abbdc -s ours am:
02ba5ef875 am:
39d2fe3a4b" into nyc-mr1-dev-plus-aosp
am:
5e5414efd8 -s ours
Change-Id: Ie765beb038e59950fb74c8a781d622e852b765f2
Sudheer Shanka [Tue, 30 Aug 2016 00:20:09 +0000 (00:20 +0000)]
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 am:
71933abbdc -s ours am:
02ba5ef875 am:
39d2fe3a4b
am:
c44fd66f04 -s ours
Change-Id: Ic6eb21e19d6ca782166f8f7b0af7ccef2a6bb318
Amith Yamasani [Tue, 30 Aug 2016 00:19:25 +0000 (00:19 +0000)]
Merge "Merge "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 am:
7586e03e06 -s ours" into nyc-dev am:
5f5403def8 am:
fd539fc8e0" into nyc-mr1-dev-plus-aosp
am:
bb0ac25c41 -s ours
Change-Id: I936957129a1296b6bbc47dfa87eed99a5b6b6ced
Amith Yamasani [Tue, 30 Aug 2016 00:19:16 +0000 (00:19 +0000)]
Merge "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 am:
7586e03e06 -s ours" into nyc-dev am:
5f5403def8 am:
fd539fc8e0
am:
4c693343b7 -s ours
Change-Id: I807b584d82df5f8a104912ec4a65b8fb28449ac0
Amith Yamasani [Tue, 30 Aug 2016 00:18:40 +0000 (00:18 +0000)]
Merge "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 am:
7586e03e06 -s ours am:
4a3caefd6c am:
5e403681cd" into nyc-mr1-dev-plus-aosp
am:
804df8db3d -s ours
Change-Id: I577d8e0f27f9efe44267e2d51c7b1fd1157aa3b6
Amith Yamasani [Tue, 30 Aug 2016 00:18:36 +0000 (00:18 +0000)]
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 am:
7586e03e06 -s ours am:
4a3caefd6c am:
5e403681cd
am:
4e310a2d82 -s ours
Change-Id: I11beaee66ef34f24771dc3673d34723c4c5bf3a7
Sudheer Shanka [Tue, 30 Aug 2016 00:18:20 +0000 (00:18 +0000)]
Merge "Merge "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 am:
bc5775c18b -s ours" into nyc-dev am:
555fbf30d2 am:
80f80e7e70" into nyc-mr1-dev-plus-aosp
am:
88b04cfa2b -s ours
Change-Id: I55bae4f188f635fccd8de4a21f92a958f26373ef
Sudheer Shanka [Tue, 30 Aug 2016 00:18:17 +0000 (00:18 +0000)]
Merge "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 am:
bc5775c18b -s ours" into nyc-dev am:
555fbf30d2 am:
80f80e7e70
am:
83623be331 -s ours
Change-Id: I32991c6c138d5ddfd96d71777e69c6690122afad
Sudheer Shanka [Tue, 30 Aug 2016 00:09:40 +0000 (00:09 +0000)]
Merge "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 am:
bc5775c18b -s ours am:
6a9490f850 am:
6a031dec20" into nyc-mr1-dev-plus-aosp
am:
d1b3cbac51 -s ours
Change-Id: Ib6ed28b36839415df6903dabc280a748289147f5
Sudheer Shanka [Tue, 30 Aug 2016 00:09:36 +0000 (00:09 +0000)]
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 am:
bc5775c18b -s ours am:
6a9490f850 am:
6a031dec20
am:
5bb02677a8 -s ours
Change-Id: I197594b1afcb701b6751b1ce8f8968b6689eb456
Amith Yamasani [Tue, 30 Aug 2016 00:08:56 +0000 (00:08 +0000)]
Merge "Merge "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 am:
a106b52180 -s ours" into nyc-dev am:
4ee46e5b99 am:
3cf46af37b" into nyc-mr1-dev-plus-aosp
am:
d3658f16c6 -s ours
Change-Id: I6bb309f48299e88ff0cd9db7a3f0c5162f97d827
Amith Yamasani [Tue, 30 Aug 2016 00:08:46 +0000 (00:08 +0000)]
Merge "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 am:
a106b52180 -s ours" into nyc-dev am:
4ee46e5b99 am:
3cf46af37b
am:
09723e1798 -s ours
Change-Id: I549f086425cfe3ef6105a885fa07433e6f1c89b3
Amith Yamasani [Tue, 30 Aug 2016 00:08:03 +0000 (00:08 +0000)]
Merge "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 am:
a106b52180 -s ours am:
b6cc1acb63 am:
258c3eab25" into nyc-mr1-dev-plus-aosp
am:
af5b82c7dc -s ours
Change-Id: Iafcc7b6edd80e1255243458288e46f06289df15e
Amith Yamasani [Tue, 30 Aug 2016 00:07:59 +0000 (00:07 +0000)]
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 am:
a106b52180 -s ours am:
b6cc1acb63 am:
258c3eab25
am:
7c83c68c71 -s ours
Change-Id: I6870733abf28ed829dff1e453425b8b7dd88fb15
Mark Goldstein [Tue, 30 Aug 2016 00:07:46 +0000 (00:07 +0000)]
Merge "Merge "docs: Fix typo" into nyc-dev am:
8d660eebad am:
7843568a38" into nyc-mr1-dev-plus-aosp
am:
6ad34dc43a
Change-Id: Ia88c97f1c12f9f6d091a766e147eba0197b7c782
Mark Goldstein [Tue, 30 Aug 2016 00:07:43 +0000 (00:07 +0000)]
Merge "docs: Fix typo" into nyc-dev am:
8d660eebad am:
7843568a38
am:
d12051bf2d
Change-Id: I189427434b4fcd44ddbd5150d0f285ac8616c348
Mark Goldstein [Tue, 30 Aug 2016 00:07:35 +0000 (00:07 +0000)]
Merge "docs: Fix typo am:
1c22ae296b am:
b348093ec4 am:
60a849ab32 am:
b7f8646cdc" into nyc-mr1-dev-plus-aosp
am:
1d5eb10c38
Change-Id: If70e5ba7a86dc3ee3ce38b345631b11ef7d4b827
Mark Goldstein [Tue, 30 Aug 2016 00:07:30 +0000 (00:07 +0000)]
docs: Fix typo am:
1c22ae296b am:
b348093ec4 am:
60a849ab32 am:
b7f8646cdc
am:
afbdded2bc
Change-Id: I3a814aeb687652697b38a7d5711fc362c5763e10
Narayan Kamath [Mon, 29 Aug 2016 23:56:26 +0000 (23:56 +0000)]
Merge "resolve merge conflicts of
5191225 to mnc-dev am:
1fbc4b8624 am:
8f4f9e4d5e am:
a21569cd76 am:
b0429bbad5 am:
1238ffcd2c am:
22585d75f9 am:
36b9c90299 am:
6bb536748e" into nyc-mr1-dev-plus-aosp
am:
e90e113c07
Change-Id: Ia5010c54337af889420453732470bc4315406fd1
Narayan Kamath [Mon, 29 Aug 2016 23:56:22 +0000 (23:56 +0000)]
resolve merge conflicts of
5191225 to mnc-dev am:
1fbc4b8624 am:
8f4f9e4d5e am:
a21569cd76 am:
b0429bbad5 am:
1238ffcd2c am:
22585d75f9 am:
36b9c90299 am:
6bb536748e
am:
e163e9ad0d
Change-Id: Id71e7eeccf16d1ec5518f13896bc63fedd611534
Svetoslav Ganov [Mon, 29 Aug 2016 23:56:05 +0000 (23:56 +0000)]
Merge "Merge "Fix a regression in sync manager" into nyc-mr1-dev am:
6f1955bf23 am:
166d67b769" into nyc-mr1-dev-plus-aosp
am:
cc8288299c
Change-Id: Ib8733a28b5b63a66ec953aa7556ccff3912079d5
Svetoslav Ganov [Mon, 29 Aug 2016 23:56:01 +0000 (23:56 +0000)]
Merge "Fix a regression in sync manager" into nyc-mr1-dev am:
6f1955bf23 am:
166d67b769
am:
5d36183fa1
Change-Id: I1c481aa414d8e1bd33b5b87ba18904840ffb2a10
Svet Ganov [Mon, 29 Aug 2016 23:55:51 +0000 (23:55 +0000)]
Merge "Fix a regression in sync manager am:
dfed1c73ec am:
a09f3790ac" into nyc-mr1-dev-plus-aosp
am:
c13ac2e388
Change-Id: I9b222d4dce6a776d026185eecbd0c6ddb2c8a09c
Svet Ganov [Mon, 29 Aug 2016 23:55:44 +0000 (23:55 +0000)]
Fix a regression in sync manager am:
dfed1c73ec am:
a09f3790ac
am:
511801eb0f
Change-Id: I79e04f64bbd4ee42e1cae17a43c71dff5db96586
Pankaj Kanwar [Mon, 29 Aug 2016 23:55:36 +0000 (23:55 +0000)]
Merge "Merge "Show a toast when switching from wifi to Verizon cell data." into nyc-dr1-dev am:
5d06597072 am:
a65318a290 am:
64145a519a" into nyc-mr1-dev-plus-aosp
am:
f05253700a
Change-Id: Ie8907f6d58280e3bfdbee1c89f899b8a5c28a4bb
Pankaj Kanwar [Mon, 29 Aug 2016 23:55:33 +0000 (23:55 +0000)]
Merge "Show a toast when switching from wifi to Verizon cell data." into nyc-dr1-dev am:
5d06597072 am:
a65318a290 am:
64145a519a
am:
a6f3563cc3
Change-Id: I65f1d3961d3671917efdc9a3bb446666d25d78f5
Mark Goldstein [Mon, 29 Aug 2016 23:55:24 +0000 (23:55 +0000)]
docs: Fix typo am:
1c22ae296b am:
94d4c84f38
am:
269756de07
Change-Id: Id8c1f698a53e0a975f2dc3b03bbef9d40d4fba8a
Narayan Kamath [Mon, 29 Aug 2016 23:45:30 +0000 (23:45 +0000)]
resolve merge conflicts of
5191225 to mnc-dev am:
1fbc4b8624 am:
8f4f9e4d5e am:
a21569cd76 am:
b0429bbad5 am:
1238ffcd2c am:
5a56efd888
am:
81802f4b86
Change-Id: I918a1ab3bfce7b83f85fbe6675053cd60f158e42
Dianne Hackborn [Mon, 29 Aug 2016 23:45:27 +0000 (23:45 +0000)]
Merge "Try to mitigate issue #
31016187: system_server crash in ArraySet." into nyc-dev am:
184edd6d93 am:
c84e8f39d0
am:
c1b2539498
Change-Id: Ie42c7a8e6a517e174a556963490f3c31f43f862a
Dianne Hackborn [Mon, 29 Aug 2016 23:45:22 +0000 (23:45 +0000)]
Try to mitigate issue #
31016187: system_server crash in ArraySet. am:
dd28b7b5f3 am:
ccc9f7a59e
am:
cf884cd422
Change-Id: I684463c8facb1a82dffd843166f99cced55897cc
Mark Lu [Mon, 29 Aug 2016 23:45:18 +0000 (23:45 +0000)]
Merge "docs: rewrite one attribute description in R.attr" into nyc-dev am:
30cba33a60 am:
7973c74cdc
am:
3a29857347
Change-Id: I7366a8f2c2bf716e73a3325879d14daaa0721116
Lorenzo Colitti [Mon, 29 Aug 2016 23:45:13 +0000 (23:45 +0000)]
Merge "Show a toast when switching from wifi to Verizon cell data. am:
efe0839876 am:
88d4d15d52 am:
b9aa287404" into nyc-mr1-dev-plus-aosp
am:
c8c972387e
Change-Id: I792427aeb9fc40b5976488483657787d36cc7794
Lorenzo Colitti [Mon, 29 Aug 2016 23:45:09 +0000 (23:45 +0000)]
Show a toast when switching from wifi to Verizon cell data. am:
efe0839876 am:
88d4d15d52 am:
b9aa287404
am:
f516a8ae65
Change-Id: I6d4f0fee2426f4b831dbda74c8e8a7bd19167fd9
Dianne Hackborn [Mon, 29 Aug 2016 23:42:11 +0000 (23:42 +0000)]
Merge "Merge "Try to mitigate issue #
31016187: system_server crash in ArraySet." into nyc-dev am:
184edd6d93 am:
90a6799951 am:
22ad9a3116 am:
4ddb8760b2" into nyc-mr1-dev-plus-aosp
am:
df8a4d993b
Change-Id: I2af05d7fd19a2d73649afa6a0a25e82239520e61
Dianne Hackborn [Mon, 29 Aug 2016 23:42:06 +0000 (23:42 +0000)]
Merge "Try to mitigate issue #
31016187: system_server crash in ArraySet." into nyc-dev am:
184edd6d93 am:
90a6799951 am:
22ad9a3116 am:
4ddb8760b2
am:
b14745b20b
Change-Id: Ica2e2f5bb337981d9c513498b37d71b69d2777d8
Dianne Hackborn [Mon, 29 Aug 2016 23:41:56 +0000 (23:41 +0000)]
Merge "Try to mitigate issue #
31016187: system_server crash in ArraySet. am:
dd28b7b5f3 am:
05775d71e6 am:
2eb6e503ea am:
4587f8b4db" into nyc-mr1-dev-plus-aosp
am:
95cdc14519
Change-Id: I105732bc6db11133cc89816bc2a5026f10b871db
Dianne Hackborn [Mon, 29 Aug 2016 23:41:52 +0000 (23:41 +0000)]
Try to mitigate issue #
31016187: system_server crash in ArraySet. am:
dd28b7b5f3 am:
05775d71e6 am:
2eb6e503ea am:
4587f8b4db
am:
eaec4ede69
Change-Id: I12ad644e04b6da7383e1120ead5960a57c065a5f
Mark Lu [Mon, 29 Aug 2016 23:41:42 +0000 (23:41 +0000)]
Merge "Merge "docs: rewrite one attribute description in R.attr" into nyc-dev am:
30cba33a60 am:
40f25f1464 am:
794b9dd366 am:
ccd487a98e" into nyc-mr1-dev-plus-aosp
am:
a1e654934e
Change-Id: Ib80410436a8c2699cbb121fcb81aa4cda8544286
Mark Lu [Mon, 29 Aug 2016 23:41:39 +0000 (23:41 +0000)]
Merge "docs: rewrite one attribute description in R.attr" into nyc-dev am:
30cba33a60 am:
40f25f1464 am:
794b9dd366 am:
ccd487a98e
am:
50ef4d65c9
Change-Id: I3cc7403a99ff9c68302145d63d462d26e009da4c
Mark Lu [Mon, 29 Aug 2016 23:41:27 +0000 (23:41 +0000)]
Merge "docs: rewrite one attribute description in R.attr am:
5dabf06ae5 am:
6df44a80a3 am:
77d7db4de1 am:
e4daddf599" into nyc-mr1-dev-plus-aosp
am:
823b56fc46
Change-Id: I9c8e16290f9e2553146009b8dbe0f59c359702ab
Mark Lu [Mon, 29 Aug 2016 23:41:22 +0000 (23:41 +0000)]
docs: rewrite one attribute description in R.attr am:
5dabf06ae5 am:
6df44a80a3 am:
77d7db4de1 am:
e4daddf599
am:
ed87c941c3
Change-Id: Ie8fffdf0fa74c4d7d7d9a17f01a93eaf3e69d93a
Mark Lu [Mon, 29 Aug 2016 23:41:09 +0000 (23:41 +0000)]
Merge "docs: rewrite one attribute description in R.attr am:
5dabf06ae5 am:
833d07e53a" into nyc-mr1-dev-plus-aosp
am:
1607e155af
Change-Id: I085e292232f8a3ce7d85d59c4c9ccdad17cfa85e
Mark Lu [Mon, 29 Aug 2016 23:41:04 +0000 (23:41 +0000)]
docs: rewrite one attribute description in R.attr am:
5dabf06ae5 am:
833d07e53a
am:
4b99a57934
Change-Id: I3368c9942cca775495354fe8ebda26a3328671c5
Mark Lu [Mon, 29 Aug 2016 23:33:24 +0000 (23:33 +0000)]
Merge "Merge "docs: fix broken links in Activity reference" into nyc-dev am:
d428a012ba am:
6446e88183" into nyc-mr1-dev-plus-aosp
am:
fabe42088d
Change-Id: I68c4e2c7ff9b6fc5821bd1cebfeac16ec78dcaff
Mark Lu [Mon, 29 Aug 2016 23:33:18 +0000 (23:33 +0000)]
Merge "docs: fix broken links in Activity reference" into nyc-dev am:
d428a012ba am:
6446e88183
am:
22a15f627a
Change-Id: If472f840fad33dc54fd49fc42c7ddf6ff97dc895
Mark Lu [Mon, 29 Aug 2016 23:33:08 +0000 (23:33 +0000)]
Merge "docs: fix broken links in Activity reference am:
fa43485910 am:
c4e81b64f1" into nyc-mr1-dev-plus-aosp
am:
60002203bb
Change-Id: Id59d9fbb124b77a09b6eb7f9beea9471f72f6736
Mark Lu [Mon, 29 Aug 2016 23:33:04 +0000 (23:33 +0000)]
docs: fix broken links in Activity reference am:
fa43485910 am:
c4e81b64f1
am:
5490e91ddb
Change-Id: I65453b6e6e45834ec31fccf85ee8a6dc7d1ee23e
Mark Lu [Mon, 29 Aug 2016 23:32:55 +0000 (23:32 +0000)]
Merge "Merge "docs: fix code snippets in SQL Databases page" into nyc-dev am:
209fb02f84 am:
228b5f6fb4" into nyc-mr1-dev-plus-aosp
am:
b22874ee64
Change-Id: I77bd3f593f9c70e9cc0cae93233bf57daa20c2ef
Mark Lu [Mon, 29 Aug 2016 23:32:49 +0000 (23:32 +0000)]
Merge "docs: fix code snippets in SQL Databases page" into nyc-dev am:
209fb02f84 am:
228b5f6fb4
am:
92e7a3d43c
Change-Id: I22f8b371fa3d214dfbde2c8abe81aa58f227e0ba
Mark Lu [Mon, 29 Aug 2016 23:32:38 +0000 (23:32 +0000)]
Merge "docs: fix code snippets in SQL Databases page am:
95698f127a am:
3de2eff9d5" into nyc-mr1-dev-plus-aosp
am:
362cb51bd2
Change-Id: I33182d23e5e919f358b7301e79332af4d31b7385
Mark Lu [Mon, 29 Aug 2016 23:32:33 +0000 (23:32 +0000)]
docs: fix code snippets in SQL Databases page am:
95698f127a am:
3de2eff9d5
am:
84a77e930b
Change-Id: I366bbbc5918e04c9c59694b4c128a713a181f3e7
Mark Lu [Mon, 29 Aug 2016 23:32:23 +0000 (23:32 +0000)]
Merge "docs: fix broken links in Activity reference" into nyc-dev am:
d428a012ba am:
5c83071228 am:
7c71a2fa10 am:
1f3ded459b
am:
6c6588aa60
Change-Id: I0a3749fdb44da1da375ad7ee050397195ba3cd26
Mark Lu [Mon, 29 Aug 2016 23:20:47 +0000 (23:20 +0000)]
docs: fix broken links in Activity reference am:
fa43485910 am:
497c2907fd am:
eab610d0a6 am:
b03a1b8b25
am:
b49a7f8602
Change-Id: Ia961100dce636cdb5aae8f4882012a50d506b6f4
Mark Lu [Mon, 29 Aug 2016 23:20:35 +0000 (23:20 +0000)]
Merge "docs: fix code snippets in SQL Databases page" into nyc-dev am:
209fb02f84 am:
f858ebf9db am:
d478856ca8 am:
6bd5be87fb
am:
8abdaf0ac0
Change-Id: I8c5940f581b6cda57f1d2bd73f727954943ce639
Mark Lu [Mon, 29 Aug 2016 23:20:25 +0000 (23:20 +0000)]
docs: fix code snippets in SQL Databases page am:
95698f127a am:
6f5cf3fb0d am:
da8624a129 am:
43c71f3988
am:
de8164aa2c
Change-Id: I33a8bcc47eca7e6885bcd0bbc2b34c34a971e439
Hemal Patel [Mon, 29 Aug 2016 23:20:13 +0000 (23:20 +0000)]
Docs: Fixed the Bluetooth guide link am:
65813dff14 am:
a544221abd am:
d6a64d788b am:
42708fa473 am:
ac438b21ba
am:
278631d603
Change-Id: Icba74ceaf3461b5c1fc2ffc7c655ccd19beae77d
Hemal Patel [Mon, 29 Aug 2016 23:20:04 +0000 (23:20 +0000)]
resolve merge conflicts of
a544221 to nyc-dev-plus-aosp am:
309813c8af
am:
ac0b242755
Change-Id: Ia3bb6a624d0696a630df48073bd87595504b4ae1
Andrew Solovay [Mon, 29 Aug 2016 23:03:25 +0000 (23:03 +0000)]
Merge "docs: Removing non-English /preview/ directories am:
2d629c3e5b am:
0fd07c4e79" into nyc-mr1-dev-plus-aosp
am:
781c4b0a24
Change-Id: I96d4629a87e7d897d24861fea2d6e080048aa6a8
OSDN Git Service
