OSDN Git Service
Felipe Leme [Mon, 29 Aug 2016 18:55:32 +0000 (18:55 +0000)]
Merge "Fixed statuses on Battery Saver column." am:
21e0701f76
am:
bb205d5e3e
Change-Id: I3c4e517b25b9e1c709baa11fe8568a8efecafea9
Felipe Leme [Mon, 29 Aug 2016 18:44:28 +0000 (18:44 +0000)]
Merge "Fixed statuses on Battery Saver column."
am:
21e0701f76
Change-Id: I4125ff3ad049ef2717fe12ba7ca62d99bf9bd3c5
Andrii Kulian [Mon, 29 Aug 2016 18:44:15 +0000 (18:44 +0000)]
Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev
am:
128a4419e9
Change-Id: I86073e914c30743355c3dab7e6520c5a00eb5001
Andrii Kulian [Mon, 29 Aug 2016 18:44:12 +0000 (18:44 +0000)]
DO NOT MERGE -- Correctly finish activity in non-focused stack
am:
620040db3f
Change-Id: If7adc0d548380cfe397bbdd9469b818861583e0c
Felipe Leme [Mon, 29 Aug 2016 18:32:27 +0000 (18:32 +0000)]
Merge "Fixed statuses on Battery Saver column."
Andrii Kulian [Mon, 29 Aug 2016 18:30:06 +0000 (18:30 +0000)]
Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev
Felipe Leme [Thu, 14 Jul 2016 18:04:49 +0000 (11:04 -0700)]
Fixed statuses on Battery Saver column.
BUG:
30139400
Change-Id: I1798607af13c9be5e1f21212fd7078f7152562bd
(cherry picked from commit
9e325706f42a1dc48abe80a24323fae4579ab033)
Jason Monk [Mon, 29 Aug 2016 18:17:16 +0000 (18:17 +0000)]
Merge "Fix double status bar icons" into nyc-dev
am:
2b4e612b10
Change-Id: Ic50aea16f2c5dd14c56dac581f9780e49626ddb5
Jason Monk [Mon, 29 Aug 2016 18:17:12 +0000 (18:17 +0000)]
Fix double status bar icons
am:
12124d7eca
Change-Id: Ib9208ba63774a65d6aac32f9af06abd2769dbd43
Selim Cinek [Mon, 29 Aug 2016 18:08:49 +0000 (18:08 +0000)]
Merge "Fixed a bug where notifications could reappear" into nyc-dev
am:
4226dcef1e
Change-Id: I2f31b0a2e9d2426b6a22924b2f19ccf7590f86d0
Selim Cinek [Mon, 29 Aug 2016 18:08:42 +0000 (18:08 +0000)]
Fixed a bug where notifications could reappear
am:
f3b64692a3
Change-Id: I6cfebd6d64d09c153ba21dea7ff96793d4595ab7
Selim Cinek [Mon, 29 Aug 2016 18:08:28 +0000 (18:08 +0000)]
Fixed a bug where the headsup would be stuck disappearing
am:
a4155bb7c0
Change-Id: Ibb48a2b105212634bdff1daadb53be3f5caa4413
Jason Monk [Mon, 29 Aug 2016 18:00:00 +0000 (18:00 +0000)]
Merge "Fix double status bar icons" into nyc-dev
TreeHugger Robot [Mon, 29 Aug 2016 17:58:28 +0000 (17:58 +0000)]
Merge "Fixed a bug where notifications could reappear" into nyc-dev
Jason Monk [Tue, 26 Jul 2016 17:04:50 +0000 (13:04 -0400)]
Fix double status bar icons
Don't allow the status bar icon slot list to be changed because
it confuses the relationship between StatusBarIconList and
StatusBarIconController. Set it in the constructor to enforce
this.
Change-Id: Ieeea0a9efad88179d1cccc0e5702899333de2e72
Fixes:
28524184
(cherry picked from commit
c6fe61c59c5a3a6ae691256c9afdde3820e3dd9e)
Yi Kong [Mon, 29 Aug 2016 08:09:52 +0000 (08:09 +0000)]
Merge "Track getxattr API change" am:
c4c4a1e76e
am:
f897e1c3b6
Change-Id: I47ac9cfbd5a38849dad542089cb3fa923a8cd3fe
Yi Kong [Mon, 29 Aug 2016 08:05:05 +0000 (08:05 +0000)]
Merge "Track getxattr API change"
am:
c4c4a1e76e
Change-Id: I66059536d5dfb0999743656f095d557ddf25ff70
Treehugger Robot [Mon, 29 Aug 2016 07:57:29 +0000 (07:57 +0000)]
Merge "Track getxattr API change"
Yi Kong [Sat, 27 Aug 2016 11:16:44 +0000 (12:16 +0100)]
Track getxattr API change
Bug:
30992227
Change-Id: I788b3e51a536c7df7896f622038fe762f9848a2a
Selim Cinek [Wed, 20 Jul 2016 20:46:49 +0000 (13:46 -0700)]
Fixed a bug where notifications could reappear
With sensitive notifications a user could get into
a situation where the groupsummary would not be cleared
because its dismissability was never updated and based
on the visibility of the veto button. This is now corrected.
This Cl also cleans up the veto button handling overall and
ensures that there's no stale state arond it.
Change-Id: Ic7df8d382146d7863ee551c1daa8ba5ed384c7b5
Fixes:
30056258
(cherry picked from commit
9e624e732aa5646c83d203587be9c2c4e94c9266)
Selim Cinek [Wed, 13 Jul 2016 21:34:56 +0000 (14:34 -0700)]
Fixed a bug where the headsup would be stuck disappearing
Change-Id: I56d6be69f6e59c1bec647e7e70e50a36b793f895
Fixes:
30120962
Chih-Hung Hsieh [Sat, 27 Aug 2016 00:01:59 +0000 (00:01 +0000)]
Merge "Fix misc-macro-parentheses warnings in hwui/tests." am:
e2732e5e38
am:
e33f3472f3
Change-Id: I4601d7072c16322b70de9620a6bbaa41772d612b
Chih-Hung Hsieh [Fri, 26 Aug 2016 23:53:25 +0000 (23:53 +0000)]
Merge "Fix misc-macro-parentheses warnings in hwui/tests."
am:
e2732e5e38
Change-Id: If801b6f30a280ed8382c37765e2623eb3520ebcc
Treehugger Robot [Fri, 26 Aug 2016 23:45:07 +0000 (23:45 +0000)]
Merge "Fix misc-macro-parentheses warnings in hwui/tests."
Andrii Kulian [Thu, 21 Jul 2016 01:59:28 +0000 (18:59 -0700)]
DO NOT MERGE -- Correctly finish activity in non-focused stack
When activity is finished we first looked for next activity to
show in focused stack. If real next activity to show in place
of finishing one is in the same non-focused stack, we didn't
fully complete the dismissal process and activity was stuck in
FINISHING state.
This CL checks if we're trying to finish visible activity in
paused state and destroy it immediately if top running activity
is visible - same as we do for pinned activities.
Bug:
29458854
Change-Id: I0d5ceb2daa45c0628d89417c8456e132996bcea9
(cherry picked from commit
7318d63ba6dbb3042907d10d5369fcd5ac444d67)
Chih-Hung Hsieh [Fri, 26 Aug 2016 22:19:47 +0000 (15:19 -0700)]
Fix misc-macro-parentheses warnings in hwui/tests.
* Add parentheses around macro parameters.
Bug:
28705665
Test: build with WITH_TIDY=1
Change-Id: I04f6dd1a180ed1191bf68b685facf6fb9020b4b0
Colin Cross [Fri, 26 Aug 2016 20:32:24 +0000 (20:32 +0000)]
Merge "Replace libziparchive-host with libziparchive" am:
611e205bbe
am:
8c8bb25089
Change-Id: Iaa10133cfcf424d82f170bf5b8b21487a982e5fb
Colin Cross [Fri, 26 Aug 2016 20:25:13 +0000 (20:25 +0000)]
Merge "Replace libziparchive-host with libziparchive"
am:
611e205bbe
Change-Id: I077a18bc3e6de20e0d4d6d6213de829ea47ffe43
Colin Cross [Fri, 26 Aug 2016 20:18:54 +0000 (20:18 +0000)]
Merge "Replace libziparchive-host with libziparchive"
Colin Cross [Fri, 26 Aug 2016 18:15:17 +0000 (11:15 -0700)]
Replace libziparchive-host with libziparchive
libziparchive-host is no longer necessary, and mixing libziparchive-host
and libziparchive can cause ODR violations.
Change-Id: I623c0c5579e28f26a6e1db7bd953f33ed1ca68cd
Dirk Dougherty [Fri, 26 Aug 2016 16:25:46 +0000 (16:25 +0000)]
Merge "Fetch ga script over https to avoid mixed content." into nyc-dev
am:
c2b9d55818
Change-Id: I8458f037d8992616fbd80faba2d75b042531e0da
Dirk Dougherty [Fri, 26 Aug 2016 16:25:41 +0000 (16:25 +0000)]
Fetch ga script over https to avoid mixed content.
am:
b5760c1fe7
Change-Id: I9cee842d61cb36faebfb17ca0d236195becb8bbe
Dirk Dougherty [Fri, 26 Aug 2016 16:22:05 +0000 (16:22 +0000)]
Merge "Fetch ga script over https to avoid mixed content." into nyc-dev
Neil Fuller [Fri, 26 Aug 2016 15:16:56 +0000 (15:16 +0000)]
Merge "Track java.lang.reflect.Executable API changes" am:
43ec5716aa
am:
eefc000601
Change-Id: Ia11ce811cd9a23e4c8979bd5c8429d9f918778bf
Neil Fuller [Fri, 26 Aug 2016 15:09:33 +0000 (15:09 +0000)]
Merge "Track java.lang.reflect.Executable API changes"
am:
43ec5716aa
Change-Id: Id5159236a47ab25ae1cf6b63b7f0fb8f6325a36e
Treehugger Robot [Fri, 26 Aug 2016 15:03:21 +0000 (15:03 +0000)]
Merge "Track java.lang.reflect.Executable API changes"
Neil Fuller [Fri, 19 Aug 2016 16:58:52 +0000 (17:58 +0100)]
Track java.lang.reflect.Executable API changes
Bug:
28666126
Change-Id: I764c2c14036c4188c4dc4bb2cae40ae8745c3b26
Mark Lu [Fri, 26 Aug 2016 01:03:23 +0000 (01:03 +0000)]
Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev
am:
314d995ca1
Change-Id: I62b4f9d1eb43f429a9b49580bb0e2a75126293cd
Mark Lu [Fri, 26 Aug 2016 01:03:17 +0000 (01:03 +0000)]
docs: Fix typo and broken link in AsyncTask.java
am:
53415ff24e
Change-Id: Ib4fadd74bcf640bd28cb19e757e2cc7b605a69dd
Mark Lu [Fri, 26 Aug 2016 01:02:45 +0000 (01:02 +0000)]
Merge "docs: fix link in Loader reference page" into nyc-dev
am:
3c638c1ea1
Change-Id: I6840c9b28816fe8394faf619dcf2fb5ee399c86c
Mark Lu [Fri, 26 Aug 2016 01:02:36 +0000 (01:02 +0000)]
docs: fix link in Loader reference page
am:
9f52b7a4a8
Change-Id: I98f4ca957005ffc795e41be321b6b4995c6242f0
Sudheer Shanka [Fri, 26 Aug 2016 01:02:24 +0000 (01:02 +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: Iafc1da106a7fc6cb43fe9bb4eed11b226af66844
Sudheer Shanka [Fri, 26 Aug 2016 01:02:18 +0000 (01:02 +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: I84e59e27d3a92d3df1d901cfc57e5066c0e94139
Sudheer Shanka [Fri, 26 Aug 2016 00:48:59 +0000 (00:48 +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: I27e737406b9c9e6089750c790b3249d0b6d6a98b
Sudheer Shanka [Fri, 26 Aug 2016 00:48:56 +0000 (00:48 +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: I54d6356ecf75eb0074acb293c7958379ef7177d5
Amith Yamasani [Fri, 26 Aug 2016 00:48:44 +0000 (00:48 +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: If316a8c2efca734d3118214bf7c93d8f0d22a4c0
Amith Yamasani [Fri, 26 Aug 2016 00:48:42 +0000 (00:48 +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: I84e6f42dc34fcddf3b6e2d34250f96db2e137bed
Sudheer Shanka [Fri, 26 Aug 2016 00:48:30 +0000 (00:48 +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: I0921e35480ef8df6a2739ae2e32fde505b012374
Sudheer Shanka [Fri, 26 Aug 2016 00:48:27 +0000 (00:48 +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: If83cf4cfa6eb22a4629d26e5c0ba489bcecc3f72
Amith Yamasani [Fri, 26 Aug 2016 00:48:15 +0000 (00:48 +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: I14593f2adae00ac390543e1bd2d189fca5ee9e05
Amith Yamasani [Fri, 26 Aug 2016 00:48:13 +0000 (00:48 +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: I47dd0f3ff80996d8cbd417324ee6ab12a738f774
Mark Goldstein [Fri, 26 Aug 2016 00:47:59 +0000 (00:47 +0000)]
Merge "docs: Fix typo" into nyc-dev
am:
8d660eebad
Change-Id: Ic8e68e5004b24b0e384a7bc1c58a43f87b891547
Mark Goldstein [Fri, 26 Aug 2016 00:47:56 +0000 (00:47 +0000)]
docs: Fix typo
am:
1c22ae296b
Change-Id: I775b87f43db12889696f015b8fe4051816e6d0fd
Mark Lu [Fri, 26 Aug 2016 00:46:03 +0000 (00:46 +0000)]
Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev
Mark Lu [Fri, 26 Aug 2016 00:46:00 +0000 (00:46 +0000)]
Merge "docs: fix link in Loader reference page" into nyc-dev
Narayan Kamath [Fri, 26 Aug 2016 00:42:28 +0000 (00:42 +0000)]
resolve merge conflicts of
5191225 to mnc-dev am:
1fbc4b8624 am:
8f4f9e4d5e am:
a21569cd76 am:
b0429bbad5
am:
1238ffcd2c
Change-Id: I7f4d19c3c406157693aef46b695f0790b74d0cee
Dianne Hackborn [Fri, 26 Aug 2016 00:42:25 +0000 (00:42 +0000)]
Merge "Try to mitigate issue #
31016187: system_server crash in ArraySet." into nyc-dev
am:
184edd6d93
Change-Id: Ib05f3baf0ba536da81777576708fd74cbd7ca57b
Dianne Hackborn [Fri, 26 Aug 2016 00:42:22 +0000 (00:42 +0000)]
Try to mitigate issue #
31016187: system_server crash in ArraySet.
am:
dd28b7b5f3
Change-Id: Id493898997e0745ac2f3c65c0dfb3e4ab5ea03ae
Mark Lu [Fri, 26 Aug 2016 00:42:17 +0000 (00:42 +0000)]
Merge "docs: rewrite one attribute description in R.attr" into nyc-dev
am:
30cba33a60
Change-Id: I0e7579b2dbc58ac7cace74d6987ddfe257455197
Mark Lu [Fri, 26 Aug 2016 00:42:13 +0000 (00:42 +0000)]
docs: rewrite one attribute description in R.attr
am:
5dabf06ae5
Change-Id: Ic502b32001326255097d7ba828eb62142da8606e
Mark Lu [Fri, 26 Aug 2016 00:42:06 +0000 (00:42 +0000)]
Merge "docs: fix broken links in Activity reference" into nyc-dev
am:
d428a012ba
Change-Id: Ie87191e33c4f49cca44dd952a5722bb84c1441b8
Mark Lu [Fri, 26 Aug 2016 00:42:01 +0000 (00:42 +0000)]
docs: fix broken links in Activity reference
am:
fa43485910
Change-Id: I67134251790b12d53d31c6854073884f498ef1e5
Mark Lu [Fri, 26 Aug 2016 00:41:54 +0000 (00:41 +0000)]
Merge "docs: fix code snippets in SQL Databases page" into nyc-dev
am:
209fb02f84
Change-Id: I3236f69fd320c9b22321b54e464f450f3eef5062
Mark Lu [Fri, 26 Aug 2016 00:41:48 +0000 (00:41 +0000)]
docs: fix code snippets in SQL Databases page
am:
95698f127a
Change-Id: Id8ab4813cfd138edc65998f1258255b947f962ce
Hemal Patel [Thu, 25 Aug 2016 23:53:49 +0000 (16:53 -0700)]
resolve merge conflicts of
a544221 to nyc-dev-plus-aosp
Change-Id: Ie7a3a85fdd2e59eea4f74760010190ce9f5f9b02
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
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
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
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
OSDN Git Service
