OSDN Git Service
Winson Chung [Fri, 26 Aug 2016 01:12:02 +0000 (01:12 +0000)]
Merge "Fixing typo in dump log." into nyc-mr1-dev
am:
5ebd73f8ff
Change-Id: I2d3428c779fe20db8c12987de5b7f8f2f2c2f6ff
Winson [Fri, 26 Aug 2016 01:12:00 +0000 (01:12 +0000)]
Fixing typo in dump log.
am:
b43ba86811
Change-Id: Ied127cb30a1dabe9d44c4da7b44c3c9758b74afa
Mark Lu [Fri, 26 Aug 2016 01:11:57 +0000 (01:11 +0000)]
Merge "docs: fix link in Loader reference page" into nyc-dev am:
3c638c1ea1 am:
ceaef72fb9
am:
a5f090a768
Change-Id: Iacb60ee1d22b56d6b4ad8ebb2cdb2be841fd7a28
Mark Lu [Fri, 26 Aug 2016 01:11:55 +0000 (01:11 +0000)]
docs: fix link in Loader reference page am:
9f52b7a4a8 am:
f496b9a981
am:
e16c82d224
Change-Id: I5d3c04608f9a3cbf216d3a6c9ef2ac7bad1ebec8
Winson Chung [Fri, 26 Aug 2016 01:04:48 +0000 (01:04 +0000)]
Merge "Fixing typo in dump log." into nyc-mr1-dev
Mark Lu [Fri, 26 Aug 2016 01:03:57 +0000 (01:03 +0000)]
Merge "docs: fix link in Loader reference page" into nyc-dev am:
3c638c1ea1
am:
ceaef72fb9
Change-Id: I182c0a0e1656308e4001f4f74751091023cae42d
Mark Lu [Fri, 26 Aug 2016 01:03:56 +0000 (01:03 +0000)]
docs: fix link in Loader reference page am:
9f52b7a4a8
am:
f496b9a981
Change-Id: I7a7ee695fadb2e0774ef84724a4320fc73b45a88
Mark Lu [Fri, 26 Aug 2016 00:53:55 +0000 (00:53 +0000)]
Merge "docs: fix link in Loader reference page" into nyc-dev
am:
3c638c1ea1
Change-Id: I90e2cc4100d130299bfd7094fe727c405773f64e
Mark Lu [Fri, 26 Aug 2016 00:53:53 +0000 (00:53 +0000)]
docs: fix link in Loader reference page
am:
9f52b7a4a8
Change-Id: I32164f55f9b42dc50f13756c942644350a7d643e
Suprabh Shukla [Fri, 26 Aug 2016 00:47:30 +0000 (00:47 +0000)]
Merge "Resolving race condition while writing recent taskids" into nyc-mr1-dev
am:
769bc6c8b1
Change-Id: I77cb537a42cd3e96396f329dfaec13ff17aff167
Suprabh Shukla [Fri, 26 Aug 2016 00:47:27 +0000 (00:47 +0000)]
Resolving race condition while writing recent taskids
am:
fd0bd4f39d
Change-Id: I2bfd5c68c6a5a9989a9dab6038313a5d5849b765
Mark Lu [Fri, 26 Aug 2016 00:46:00 +0000 (00:46 +0000)]
Merge "docs: fix link in Loader reference page" into nyc-dev
TreeHugger Robot [Fri, 26 Aug 2016 00:39:42 +0000 (00:39 +0000)]
Merge "Resolving race condition while writing recent taskids" into nyc-mr1-dev
Sudheer Shanka [Fri, 26 Aug 2016 00:16:36 +0000 (00:16 +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
Change-Id: I5d1d23c9dabb84d0b2b30ff63b387c93c63c6c31
Sudheer Shanka [Fri, 26 Aug 2016 00:16:31 +0000 (00:16 +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
Change-Id: Icf46f69f758b53f4894dfec4efd3a4e86e7b26d4
Sudheer Shanka [Fri, 26 Aug 2016 00:10:27 +0000 (00:10 +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
Change-Id: I054d15eaa6b0bbcda9eb7debd5f0e98cb2caa490
Sudheer Shanka [Fri, 26 Aug 2016 00:10:25 +0000 (00:10 +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
Change-Id: Ifa4a75a1d713e19170877613cd0571ee7d084483
Amith Yamasani [Fri, 26 Aug 2016 00:10:23 +0000 (00:10 +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
Change-Id: I5ff1ce496df3516f69ff6582b4c23edad1c5b870
Amith Yamasani [Fri, 26 Aug 2016 00:10:21 +0000 (00:10 +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
Change-Id: I5f99c015e0487e266159b17d8bae2550a2f4b67c
Sudheer Shanka [Fri, 26 Aug 2016 00:10:19 +0000 (00:10 +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
Change-Id: Ibe0fde1e075d9153ed4a224fb6584f29aa4f649c
Sudheer Shanka [Fri, 26 Aug 2016 00:10:15 +0000 (00:10 +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
Change-Id: I1e5956843a2cd4ea5d25ed10a63f3164097fe1ca
Sudheer Shanka [Fri, 26 Aug 2016 00:06:01 +0000 (00:06 +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
Change-Id: I67b766b5c658101cffc4ef53db67685709aec072
Sudheer Shanka [Fri, 26 Aug 2016 00:04:36 +0000 (00:04 +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
Change-Id: Id13f196f8e25cf3267dee626fd2809f22a07c763
Amith Yamasani [Fri, 26 Aug 2016 00:04:31 +0000 (00:04 +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
Change-Id: Ibd3a6596f64ecd0c7c55d2a30ac7ea2adc002a78
Amith Yamasani [Fri, 26 Aug 2016 00:04:26 +0000 (00:04 +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
Change-Id: I38d397eeedce38abd266b6bcd38a7d58ca6e3b74
Mark Goldstein [Fri, 26 Aug 2016 00:04:22 +0000 (00:04 +0000)]
Merge "docs: Fix typo" into nyc-dev am:
8d660eebad am:
e24079f5b2
am:
b354b01acf
Change-Id: Idd3f6aaab7fd040008ea3dbd9f0d45586d99c375
Mark Goldstein [Fri, 26 Aug 2016 00:04:18 +0000 (00:04 +0000)]
docs: Fix typo am:
1c22ae296b am:
b348093ec4
am:
60a849ab32
Change-Id: I58f80277c0b6230d4b88d113c3c0606cd8f986e7
Sudheer Shanka [Fri, 26 Aug 2016 00:03:19 +0000 (00:03 +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
Change-Id: I66c2b69d13949c64390081ac7f8e868d6f025d95
Sudheer Shanka [Fri, 26 Aug 2016 00:03:15 +0000 (00:03 +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
Change-Id: I12c0a05425d5cf141d328745a19d5e56db196456
Amith Yamasani [Fri, 26 Aug 2016 00:03:12 +0000 (00:03 +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
Change-Id: Ibcaa7f162284c8a18fc68202fc169284e37099e5
Amith Yamasani [Fri, 26 Aug 2016 00:03:08 +0000 (00:03 +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
Change-Id: Id44100a4e6dd89183f445b3f8f347b127e811d01
Sudheer Shanka [Fri, 26 Aug 2016 00:03:05 +0000 (00: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
Change-Id: I8c3c930cdb6dff867e0803c60726ae44c330179d
Sudheer Shanka [Thu, 25 Aug 2016 23:58:24 +0000 (23:58 +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
Change-Id: Iaca1bc4e5187f8faa716447dad72e21e480d8fb4
Sudheer Shanka [Thu, 25 Aug 2016 23:58:21 +0000 (23:58 +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
Change-Id: Idc453e502aa7b88ded12979c51cb0fc623ab9eb3
Sudheer Shanka [Thu, 25 Aug 2016 23:56:58 +0000 (23:56 +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
Change-Id: I0d694e2d3025c5b4474530acc89efa904832cf3f
Amith Yamasani [Thu, 25 Aug 2016 23:56:54 +0000 (23:56 +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
Change-Id: Ifff4d1bafd76ccb3216a84f8607f2f8bbc65cfa3
Narayan Kamath [Thu, 25 Aug 2016 23:56:52 +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
Change-Id: I4cc808652e59fa2fca50b3777bb402d5a4d55335
Amith Yamasani [Thu, 25 Aug 2016 23:56:51 +0000 (23:56 +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
Change-Id: I6dc5805f34b81bc988c4158cac09c04e5b5b9609
Mark Goldstein [Thu, 25 Aug 2016 23:56:49 +0000 (23:56 +0000)]
Merge "docs: Fix typo" into nyc-dev am:
8d660eebad
am:
e24079f5b2
Change-Id: I8316a53f8cbcc367e5cfa43151ea68bb11591720
Mark Goldstein [Thu, 25 Aug 2016 23:56:45 +0000 (23:56 +0000)]
docs: Fix typo am:
1c22ae296b
am:
b348093ec4
Change-Id: Ia4e3200d698bf4687b788d31e40dfcb61c3ecd18
Sudheer Shanka [Thu, 25 Aug 2016 23:49:45 +0000 (23:49 +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
Change-Id: I61a488a73884cbb0e9bb2886858d8ffe92b6ae34
Sudheer Shanka [Thu, 25 Aug 2016 23:49:42 +0000 (23:49 +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
Change-Id: Id1c710fc85ba3aa516645bb56b9ab744bdf5eb1e
Amith Yamasani [Thu, 25 Aug 2016 23:49:30 +0000 (23:49 +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
Change-Id: Id8752560cdf0d732f96d5987a5fe2cc79883ac10
Amith Yamasani [Thu, 25 Aug 2016 23:49:28 +0000 (23:49 +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
Change-Id: I46bfb961a022dc383510d9189b4de2dfa91dde9d
Sudheer Shanka [Thu, 25 Aug 2016 23:49:16 +0000 (23:49 +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
Change-Id: I03d222633c7a276b889035faf900e2fa66f7289f
Sudheer Shanka [Thu, 25 Aug 2016 23:49:14 +0000 (23:49 +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
Change-Id: I51c3762d21c30d091d33e79b83b4f09dfdf72d19
Amith Yamasani [Thu, 25 Aug 2016 23:49:03 +0000 (23:49 +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
Change-Id: Ifb42c3e05317e63ed428e1f542a691dacfb187a8
Amith Yamasani [Thu, 25 Aug 2016 23:49:01 +0000 (23:49 +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
Change-Id: I589b676604afc0e728d2aa7c7616f53698aec900
Mark Goldstein [Thu, 25 Aug 2016 23:48:49 +0000 (23:48 +0000)]
Merge "docs: Fix typo" into nyc-dev
am:
8d660eebad
Change-Id: I4df576fd0f070c4104ff83498eca20987c6a7b07
Mark Goldstein [Thu, 25 Aug 2016 23:48:46 +0000 (23:48 +0000)]
docs: Fix typo
am:
1c22ae296b
Change-Id: I9f7f4389583eedbae2df7554f974d49ebe4b9c1e
Android Build Merger (Role) [Thu, 25 Aug 2016 23:41:48 +0000 (23:41 +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
Android Build Merger (Role) [Thu, 25 Aug 2016 23:41:39 +0000 (23:41 +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
Android Build Merger (Role) [Thu, 25 Aug 2016 23:41:30 +0000 (23:41 +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
Android Build Merger (Role) [Thu, 25 Aug 2016 23:41:16 +0000 (23:41 +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
Android Build Merger (Role) [Thu, 25 Aug 2016 23:41:06 +0000 (23:41 +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
Mark Goldstein [Thu, 25 Aug 2016 23:40:40 +0000 (23:40 +0000)]
Merge "docs: Fix typo" into nyc-dev
Sudheer Shanka [Thu, 25 Aug 2016 23:39:59 +0000 (23:39 +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
Change-Id: Ib35ca340d72a71b8cd9ae6d850375012461977ad
Narayan Kamath [Thu, 25 Aug 2016 23:39:59 +0000 (23:39 +0000)]
resolve merge conflicts of
5191225 to mnc-dev am:
1fbc4b8624 am:
8f4f9e4d5e am:
a21569cd76 am:
b0429bbad5 am:
1238ffcd2c
am:
22585d75f9
Change-Id: Ibd2d78486d75934c5c99ccede94e5ced5776e4bf
Sudheer Shanka [Thu, 25 Aug 2016 23:39:54 +0000 (23:39 +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
Change-Id: I5dbd13447fe89f0fa6040b9377098fda50335ca9
Amith Yamasani [Thu, 25 Aug 2016 23:39:49 +0000 (23:39 +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
Change-Id: I404e1cdbb507d5c48c31cd3fddc3ff5f9e1078b5
Sudheer Shanka [Thu, 25 Aug 2016 23:39:41 +0000 (23:39 +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
Change-Id: Iabe2db5b615a67130bffceca1801fd5ee9749ba0
Amith Yamasani [Thu, 25 Aug 2016 23:39:37 +0000 (23:39 +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
Change-Id: Ia656bceb884d47015003d6c60f54f18f2217c01b
Narayan Kamath [Thu, 25 Aug 2016 23:35:41 +0000 (23:35 +0000)]
resolve merge conflicts of
5191225 to mnc-dev am:
1fbc4b8624 am:
8f4f9e4d5e am:
a21569cd76 am:
b0429bbad5
am:
1238ffcd2c
Change-Id: I4fa223dc0d1e1beeb6d9a8a7dfd1181efe473a90
Sudheer Shanka [Thu, 25 Aug 2016 23:30:05 +0000 (23:30 +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
Change-Id: Ib8939aceb6c23ce3273eef396a9d8fa09aa4aeb8
Sudheer Shanka [Thu, 25 Aug 2016 23:30:03 +0000 (23:30 +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
Change-Id: Icf80dd720b371aa3ee488f074b5c038607691b80
Amith Yamasani [Thu, 25 Aug 2016 23:29:59 +0000 (23:29 +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
Change-Id: I09846a866cdfec673fd99d5c7574d31734335d85
Sudheer Shanka [Thu, 25 Aug 2016 23:29:56 +0000 (23:29 +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
Change-Id: I08ec5c73b827a58274aaa3422bd5ca57eb67e402
Amith Yamasani [Thu, 25 Aug 2016 23:29:52 +0000 (23:29 +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
Change-Id: I4470a56b330eb087ecd2f2662ad99fccbca917cf
Narayan Kamath [Thu, 25 Aug 2016 23:29:29 +0000 (23:29 +0000)]
resolve merge conflicts of
5191225 to mnc-dev am:
1fbc4b8624 am:
8f4f9e4d5e am:
a21569cd76
am:
b0429bbad5
Change-Id: I0212348400f48551e21902938c5b42c7edb0ea9c
Sudheer Shanka [Thu, 25 Aug 2016 23:22:19 +0000 (23:22 +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
Change-Id: I1d755ef86b80f723c3fde59476e0018167fbf8b7
Sudheer Shanka [Thu, 25 Aug 2016 23:22:14 +0000 (23:22 +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
Change-Id: If4a1716de3d54d6a08025665cdff51edc1b2f6da
Amith Yamasani [Thu, 25 Aug 2016 23:22:10 +0000 (23:22 +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
Change-Id: I2646c10763640e6079e09e6fd53b9958b3aba2ea
Sudheer Shanka [Thu, 25 Aug 2016 23:22:04 +0000 (23:22 +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
Change-Id: I59f3ace3a9c72a6d2fe1e1bd4cadec102a8c6254
Amith Yamasani [Thu, 25 Aug 2016 23:22:00 +0000 (23:22 +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
Change-Id: If920208b052d41a80d3a0bf70af831313c9b9c06
Narayan Kamath [Thu, 25 Aug 2016 23:21:09 +0000 (23:21 +0000)]
resolve merge conflicts of
5191225 to mnc-dev am:
1fbc4b8624 am:
8f4f9e4d5e
am:
a21569cd76
Change-Id: I502200a2a204e576944033a58ccd4be272603d5e
Svetoslav Ganov [Thu, 25 Aug 2016 23:21:05 +0000 (23:21 +0000)]
Merge "Fix a regression in sync manager" into nyc-mr1-dev
am:
6f1955bf23
Change-Id: I34edacf49f94d6e994aaa749ee451225c28cfb54
Svet Ganov [Thu, 25 Aug 2016 23:20:58 +0000 (23:20 +0000)]
Fix a regression in sync manager
am:
dfed1c73ec
Change-Id: Ib9317b1a80836b9162a443dfa06c73b4ba1f8337
Pankaj Kanwar [Thu, 25 Aug 2016 23:20:51 +0000 (23:20 +0000)]
Merge "Show a toast when switching from wifi to Verizon cell data." into nyc-dr1-dev am:
5d06597072
am:
a65318a290
Change-Id: I394091aab4375c0cbbdc2d65f85178e62ac89463
Lorenzo Colitti [Thu, 25 Aug 2016 23:20:48 +0000 (23:20 +0000)]
Show a toast when switching from wifi to Verizon cell data. am:
efe0839876
am:
88d4d15d52
Change-Id: I0d4a6826adaa2e7a17a152d5240b5331c38820d0
Svetoslav Ganov [Thu, 25 Aug 2016 23:14:22 +0000 (23:14 +0000)]
Merge "Fix a regression in sync manager" into nyc-mr1-dev
Sudheer Shanka [Thu, 25 Aug 2016 23:14:09 +0000 (23:14 +0000)]
resolve merge conflicts of
270947f to klp-modular-dev am:
76c4b2a7b6 -s ours am:
bbbb514bc9 am:
6a50270944 am:
a0994c6d58 am:
cdf70ba0a3
am:
c2a760e68c
Change-Id: I2e5a3bb037921013e78b4270d843cebe239ac520
Sudheer Shanka [Thu, 25 Aug 2016 23:14:06 +0000 (23:14 +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
Change-Id: Ie94c3c24a3b07c26c8b363358f4df1d7366d95a2
Amith Yamasani [Thu, 25 Aug 2016 23:14:04 +0000 (23:14 +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
Change-Id: Idd437ad418ac2deaf08a9c0ac89cb518c216d8f1
Sudheer Shanka [Thu, 25 Aug 2016 23:14:01 +0000 (23:14 +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
Change-Id: Ia473e706d7b50376fffb122e03e48bd947f47562
Amith Yamasani [Thu, 25 Aug 2016 23:13:58 +0000 (23:13 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
b02862c2cf am:
dd0be992c0 am:
117a383099 -s ours
am:
368ae62e9d
Change-Id: Icfafc6e9d56a97777db1c3d0e0feae3305f6707f
Narayan Kamath [Thu, 25 Aug 2016 23:13:51 +0000 (23:13 +0000)]
resolve merge conflicts of
5191225 to mnc-dev am:
1fbc4b8624
am:
8f4f9e4d5e
Change-Id: I2f470a15113ac14219dea82c3a9487ef96f3f2f4
Narayan Kamath [Thu, 25 Aug 2016 23:08:25 +0000 (23:08 +0000)]
resolve merge conflicts of
5191225 to mnc-dev
am:
1fbc4b8624
Change-Id: Id3aad329dd515a392cbeb2f0e03c2eb5aee5cf71
Sudheer Shanka [Thu, 25 Aug 2016 23:07:56 +0000 (23:07 +0000)]
resolve merge conflicts of
270947f to klp-modular-dev am:
76c4b2a7b6 -s ours am:
bbbb514bc9 am:
6a50270944 am:
a0994c6d58
am:
cdf70ba0a3
Change-Id: Ia7c597b1b96e65cce89396a6b509a796bb17bc2c
Sudheer Shanka [Thu, 25 Aug 2016 23:07:53 +0000 (23:07 +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
Change-Id: Ia4a5952bc4fda5be8602708215ff1d72a5db297a
Amith Yamasani [Thu, 25 Aug 2016 23:07:51 +0000 (23:07 +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
Change-Id: I40d855d0f87483a6a8733475b490ddf6ee582433
Sudheer Shanka [Thu, 25 Aug 2016 23:07:49 +0000 (23:07 +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
Change-Id: Id2ddb640c8d041f13a78c5f07fb1749968618b61
Amith Yamasani [Thu, 25 Aug 2016 23:07:46 +0000 (23:07 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
b02862c2cf am:
dd0be992c0
am:
117a383099 -s ours
Change-Id: I8173ba5c3156a6294d672db63c4a310b0c880cfb
Pankaj Kanwar [Thu, 25 Aug 2016 22:53:36 +0000 (22:53 +0000)]
Merge "Show a toast when switching from wifi to Verizon cell data." into nyc-dr1-dev
am:
5d06597072
Change-Id: Iaa541e5454184d047ea75548c480953ec2f7bbc3
Lorenzo Colitti [Thu, 25 Aug 2016 22:53:31 +0000 (22:53 +0000)]
Show a toast when switching from wifi to Verizon cell data.
am:
efe0839876
Change-Id: Iaacca358e70216f18a2f1ee98e717b301e918881
Svet Ganov [Thu, 25 Aug 2016 22:40:52 +0000 (15:40 -0700)]
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
Dianne Hackborn [Thu, 25 Aug 2016 22:43:44 +0000 (22:43 +0000)]
Merge "Try to mitigate issue #
31016187: system_server crash in ArraySet." into nyc-dev am:
184edd6d93 am:
90a6799951
am:
22ad9a3116
Change-Id: If77340cf08148afaf8ad61ae5e0bef299948958e
Dianne Hackborn [Thu, 25 Aug 2016 22:43:42 +0000 (22:43 +0000)]
Try to mitigate issue #
31016187: system_server crash in ArraySet. am:
dd28b7b5f3 am:
05775d71e6
am:
2eb6e503ea
Change-Id: I76ecb94f695405dd9938680cdb31a86b8d3411a2
Mark Lu [Thu, 25 Aug 2016 22:34:31 +0000 (22:34 +0000)]
Merge "docs: rewrite one attribute description in R.attr" into nyc-dev am:
30cba33a60 am:
40f25f1464
am:
794b9dd366
Change-Id: I5abd01756908d9a0bf8763855f89e8ef005ee1c0
Mark Lu [Thu, 25 Aug 2016 22:34:27 +0000 (22:34 +0000)]
docs: rewrite one attribute description in R.attr am:
5dabf06ae5 am:
6df44a80a3
am:
77d7db4de1
Change-Id: I24f5d7c743cc7508a7ac46b6b15262b75178065a
Pankaj Kanwar [Thu, 25 Aug 2016 22:34:20 +0000 (22:34 +0000)]
Merge "Show a toast when switching from wifi to Verizon cell data." into nyc-dr1-dev