Amith Yamasani
|
586fa0cefd
|
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
|
2016-08-26 00:10:23 +00:00 |
|
Amith Yamasani
|
3025752705
|
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
|
2016-08-26 00:10:21 +00:00 |
|
Sudheer Shanka
|
cb6f2eeb33
|
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
|
2016-08-26 00:10:19 +00:00 |
|
Sudheer Shanka
|
d5be8af093
|
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
|
2016-08-26 00:04:36 +00:00 |
|
Amith Yamasani
|
e18ec512c6
|
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
|
2016-08-26 00:04:31 +00:00 |
|
Amith Yamasani
|
995980b3a1
|
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
|
2016-08-26 00:04:26 +00:00 |
|
Mark Goldstein
|
0f91a8a84e
|
Merge "docs: Fix typo" into nyc-dev am: 8d660eebad am: e24079f5b2
am: b354b01acf
Change-Id: Idd3f6aaab7fd040008ea3dbd9f0d45586d99c375
|
2016-08-26 00:04:22 +00:00 |
|
Mark Goldstein
|
b7f8646cdc
|
docs: Fix typo am: 1c22ae296b am: b348093ec4
am: 60a849ab32
Change-Id: I58f80277c0b6230d4b88d113c3c0606cd8f986e7
|
2016-08-26 00:04:18 +00:00 |
|
Amith Yamasani
|
710c5ea5a6
|
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
|
2016-08-26 00:03:12 +00:00 |
|
Amith Yamasani
|
216e40b926
|
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
|
2016-08-26 00:03:08 +00:00 |
|
Sudheer Shanka
|
148acfcb45
|
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
|
2016-08-26 00:03:05 +00:00 |
|
Sudheer Shanka
|
ea35f92f98
|
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
|
2016-08-25 23:56:58 +00:00 |
|
Amith Yamasani
|
af4f11bdf6
|
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
|
2016-08-25 23:56:54 +00:00 |
|
Narayan Kamath
|
6bb536748e
|
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
|
2016-08-25 23:56:52 +00:00 |
|
Amith Yamasani
|
1c6048e697
|
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
|
2016-08-25 23:56:51 +00:00 |
|
Mark Goldstein
|
b354b01acf
|
Merge "docs: Fix typo" into nyc-dev am: 8d660eebad
am: e24079f5b2
Change-Id: I8316a53f8cbcc367e5cfa43151ea68bb11591720
|
2016-08-25 23:56:49 +00:00 |
|
Mark Goldstein
|
60a849ab32
|
docs: Fix typo am: 1c22ae296b
am: b348093ec4
Change-Id: Ia4e3200d698bf4687b788d31e40dfcb61c3ecd18
|
2016-08-25 23:56:45 +00:00 |
|
Amith Yamasani
|
d8ffc6239b
|
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
|
2016-08-25 23:49:30 +00:00 |
|
Amith Yamasani
|
f7259775d8
|
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
|
2016-08-25 23:49:28 +00:00 |
|
Sudheer Shanka
|
12a668fde8
|
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
|
2016-08-25 23:49:16 +00:00 |
|
Sudheer Shanka
|
380d9b9486
|
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
|
2016-08-25 23:49:14 +00:00 |
|
Amith Yamasani
|
fda97bed8d
|
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
|
2016-08-25 23:49:03 +00:00 |
|
Amith Yamasani
|
b6813f24ae
|
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
|
2016-08-25 23:49:01 +00:00 |
|
Mark Goldstein
|
e24079f5b2
|
Merge "docs: Fix typo" into nyc-dev
am: 8d660eebad
Change-Id: I4df576fd0f070c4104ff83498eca20987c6a7b07
|
2016-08-25 23:48:49 +00:00 |
|
Mark Goldstein
|
b348093ec4
|
docs: Fix typo
am: 1c22ae296b
Change-Id: I9f7f4389583eedbae2df7554f974d49ebe4b9c1e
|
2016-08-25 23:48:46 +00:00 |
|
Android Build Merger (Role)
|
5f5403def8
|
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
|
2016-08-25 23:41:32 +00:00 |
|
Android Build Merger (Role)
|
555fbf30d2
|
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
|
2016-08-25 23:41:20 +00:00 |
|
Android Build Merger (Role)
|
4ee46e5b99
|
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
|
2016-08-25 23:41:08 +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
Change-Id: Ibd2d78486d75934c5c99ccede94e5ced5776e4bf
|
2016-08-25 23:39:59 +00:00 |
|
Amith Yamasani
|
4a3caefd6c
|
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
|
2016-08-25 23:39:49 +00:00 |
|
Sudheer Shanka
|
6a9490f850
|
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
|
2016-08-25 23:39:41 +00:00 |
|
Amith Yamasani
|
b6cc1acb63
|
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
|
2016-08-25 23:39:37 +00:00 |
|
Narayan Kamath
|
22585d75f9
|
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e am: a21569cd76 am: b0429bbad5
am: 1238ffcd2c
Change-Id: I4fa223dc0d1e1beeb6d9a8a7dfd1181efe473a90
|
2016-08-25 23:35:41 +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
Change-Id: I09846a866cdfec673fd99d5c7574d31734335d85
|
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
Change-Id: I08ec5c73b827a58274aaa3422bd5ca57eb67e402
|
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
Change-Id: I4470a56b330eb087ecd2f2662ad99fccbca917cf
|
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
Change-Id: I0212348400f48551e21902938c5b42c7edb0ea9c
|
2016-08-25 23:29:29 +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
Change-Id: I2646c10763640e6079e09e6fd53b9958b3aba2ea
|
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
Change-Id: I59f3ace3a9c72a6d2fe1e1bd4cadec102a8c6254
|
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
Change-Id: If920208b052d41a80d3a0bf70af831313c9b9c06
|
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
Change-Id: I502200a2a204e576944033a58ccd4be272603d5e
|
2016-08-25 23:21:09 +00:00 |
|
Svetoslav Ganov
|
166d67b769
|
Merge "Fix a regression in sync manager" into nyc-mr1-dev
am: 6f1955bf23
Change-Id: I34edacf49f94d6e994aaa749ee451225c28cfb54
|
2016-08-25 23:21:05 +00:00 |
|
Svet Ganov
|
a09f3790ac
|
Fix a regression in sync manager
am: dfed1c73ec
Change-Id: Ib9317b1a80836b9162a443dfa06c73b4ba1f8337
|
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
Change-Id: I394091aab4375c0cbbdc2d65f85178e62ac89463
|
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
Change-Id: I0d4a6826adaa2e7a17a152d5240b5331c38820d0
|
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 |
|
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
Change-Id: Idd437ad418ac2deaf08a9c0ac89cb518c216d8f1
|
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
Change-Id: Ia473e706d7b50376fffb122e03e48bd947f47562
|
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
Change-Id: Icfafc6e9d56a97777db1c3d0e0feae3305f6707f
|
2016-08-25 23:13:58 +00:00 |
|