OSDN Git Service
Felipe Leme [Tue, 30 Aug 2016 19:15:09 +0000 (12:15 -0700)]
Added missing @Test
BUG:
28791717
Test: none
Change-Id: Iaa574218d2232b3bd8fbce0a9259d25708baebed
Felipe Leme [Tue, 30 Aug 2016 17:39:55 +0000 (17:39 +0000)]
Merge "Moar test cases for NetworkPolicyManagerServiceTest."
Jorim Jaggi [Tue, 30 Aug 2016 17:20:17 +0000 (17:20 +0000)]
Play sound on ACTION_DOWN for navigation keys am:
05bce15da9 am:
9bdfbd7c82
am:
214f2fe7b4
Change-Id: I5cd28d2b4c1d903fa76a8bae0edec93d7d047282
Brian Duddie [Tue, 30 Aug 2016 17:20:13 +0000 (17:20 +0000)]
Merge "ContextHubManager: Document InstanceInfo bug" into nyc-mr1-dev am:
73f511e471 am:
3a41c5b654
am:
1e9d0f17cf
Change-Id: Ib91456a530ba5fd8e67ae92046d52fbfe392bbb1
Greg Kaiser [Tue, 30 Aug 2016 17:20:09 +0000 (17:20 +0000)]
ContextHubManager: Document InstanceInfo bug am:
3be73d3950 am:
6f155aa4bf
am:
7fd9e40381
Change-Id: I0f95997e013d5cb8fb23b18ad82763cc091e38f1
Paul Stewart [Tue, 30 Aug 2016 17:20:05 +0000 (17:20 +0000)]
Merge "Document correct context for obtaining WifiManager" into nyc-mr1-dev am:
855210170c am:
1377955965
am:
2154beb07e
Change-Id: I9c0fa23c50528802ad22a2a9de0af0b4660b43db
Paul Stewart [Tue, 30 Aug 2016 17:20:02 +0000 (17:20 +0000)]
Document correct context for obtaining WifiManager am:
0e164b199e am:
b09557b3cf
am:
163a135246
Change-Id: I943a2d60461633b9432bdf83c3b25086bba22b94
Allen Hair [Tue, 30 Aug 2016 17:13:10 +0000 (17:13 +0000)]
Merge "Configure code coverage filters." into nyc-mr1-dev am:
6bf296f6dc am:
baac84303c
am:
99b8ff8b7d
Change-Id: Ibfe5e6fcd6bb3791b37d13bbc665b54990fb18f3
Allen Hair [Tue, 30 Aug 2016 17:13:01 +0000 (17:13 +0000)]
Configure code coverage filters. am:
02fd609460 am:
15b70213a4
am:
8b931e08d0
Change-Id: If94db4d01eb5ff4a9f463200d529b0054899bcd5
Fyodor Kupolov [Tue, 30 Aug 2016 17:12:54 +0000 (17:12 +0000)]
Merge "Fix AccountManagerServiceTest" into nyc-mr1-dev am:
4be496d2d0 am:
429a0197bf
am:
53fffe11d6
Change-Id: I4148a7c506843d096f26dd177523d33ebeafd7e4
Fyodor Kupolov [Tue, 30 Aug 2016 17:12:50 +0000 (17:12 +0000)]
Fix AccountManagerServiceTest am:
d954357860 am:
658b8e7e4b
am:
eac40d9949
Change-Id: I27b4175f949e5416943a2a3782b772ce65b846e6
Dirk Dougherty [Tue, 30 Aug 2016 17:12:45 +0000 (17:12 +0000)]
Merge "Fetch ga script over https to avoid mixed content." into nyc-dev am:
c2b9d55818 am:
61f52fca96 am:
be1a09ef47 am:
c49ce72fd8
am:
5d00f19d56
Change-Id: I831a64899605bac06f3a687906d36b3c9e5c6176
Dirk Dougherty [Tue, 30 Aug 2016 17:09:59 +0000 (17:09 +0000)]
Fetch ga script over https to avoid mixed content. am:
b5760c1fe7 am:
324054e7d4 am:
26901d3715 am:
5e34cccda6
am:
b130000df4
Change-Id: I87c1d102b884e8a0c34d74152c7701518540a110
Dirk Dougherty [Tue, 30 Aug 2016 17:09:56 +0000 (17:09 +0000)]
Merge "Fetch ga script over https to avoid mixed content." into nyc-dev am:
c2b9d55818 am:
4019963b96
am:
968699da73
Change-Id: Iaaef50a5500469cfb5a66795fe9f87d34fcd5db7
Dirk Dougherty [Tue, 30 Aug 2016 17:09:53 +0000 (17:09 +0000)]
Fetch ga script over https to avoid mixed content. am:
b5760c1fe7 am:
9ca38e3379
am:
d3a7388469
Change-Id: I22fcacf94b4553379893bdc8ece9ebac4f62c3bd
Brian Duddie [Tue, 30 Aug 2016 17:09:48 +0000 (17:09 +0000)]
Merge "ContextHub: Avoid reference leaks" into nyc-mr1-dev am:
6bf3424ccf am:
34230195ab
am:
05f7e7aedf
Change-Id: I145a9a8655bdba5fa2af745db9c8c358d96efe79
Andrew Rossignol [Tue, 30 Aug 2016 17:09:45 +0000 (17:09 +0000)]
ContextHub: Avoid reference leaks am:
c35104535c am:
e2478c4cb6
am:
e2107bfe13
Change-Id: Ice5979ec7e118a74abf4eb66267c7a1238f162b7
Neil Fuller [Tue, 30 Aug 2016 17:01:39 +0000 (17:01 +0000)]
Merge "Track java.lang.reflect.Executable API changes" am:
43ec5716aa am:
eefc000601 am:
d8d495f1eb
am:
d97db3e80e
Change-Id: I01b15ae35aa3c66e4d98938bf1270ea2c4194a4a
Jason Monk [Tue, 30 Aug 2016 17:01:33 +0000 (17:01 +0000)]
Merge "Backup system QS tiles" into nyc-dr1-dev am:
f498d0d384 am:
68d7519060 am:
b481f7ce7d
am:
a99df5eee1
Change-Id: I4506095378615a3a92b472187c5a58f1f5604317
Jason Monk [Tue, 30 Aug 2016 14:54:03 +0000 (10:54 -0400)]
resolve merge conflicts of
d70ed99 to master
Change-Id: I3a8d3708e050b3fb963dd057c0be9d2d249d037a
Victor Chang [Tue, 30 Aug 2016 12:38:51 +0000 (12:38 +0000)]
Merge "forceUpdateUserSetupComplete should have no effect in user build"
Greg Kaiser [Tue, 30 Aug 2016 01:48:36 +0000 (01:48 +0000)]
ContextHubService: Avoid uninitialized handle am:
9d4d881cc5 am:
b70ed04911
am:
d98afc1cc9
Change-Id: I13586a46e44442a962682b2c74e17187a0932cfe
Greg Kaiser [Tue, 30 Aug 2016 01:38:36 +0000 (01:38 +0000)]
Merge "NanoAppFilter: Workaround HubId issues" into nyc-mr1-dev am:
f8d61675ac am:
a0ce60d36f
am:
429b812811
Change-Id: I710253406aa0940dc7214d160260757d251ccc96
Greg Kaiser [Tue, 30 Aug 2016 01:38:27 +0000 (01:38 +0000)]
NanoAppFilter: Workaround HubId issues am:
3907049080 am:
41ef2a038d
am:
d20ed26dff
Change-Id: Iba85f8939fca3bf097f8778fdd980bd9290a7530
Greg Kaiser [Tue, 30 Aug 2016 01:38:16 +0000 (01:38 +0000)]
Merge "ContextHubService: Maintain hub result meaning" into nyc-mr1-dev am:
18e59f2988 am:
d06faffad8
am:
f5a291c514
Change-Id: I506da83561fb47bcff273c7d61dc481b4912cb79
Greg Kaiser [Tue, 30 Aug 2016 01:38:09 +0000 (01:38 +0000)]
ContextHubService: Maintain hub result meaning am:
6d9e7f669a am:
9ea48989ce
am:
e84227f209
Change-Id: I84f8715bb57ec68c749c31abc0705c8f140a512e
Greg Kaiser [Tue, 30 Aug 2016 01:38:02 +0000 (01:38 +0000)]
Merge "ContextHubManager: Fix API documentation." into nyc-mr1-dev am:
1e07e392c3 am:
d5b81eb77d
am:
f207d60e2c
Change-Id: I189333c712c0ec1f59ef09f57baeb450797c6448
Greg Kaiser [Tue, 30 Aug 2016 01:32:36 +0000 (01:32 +0000)]
ContextHubManager: Fix API documentation. am:
fac5be2ace am:
921e7ef350
am:
fce14d1808
Change-Id: Ib5e0ba71519b2be92064b691c4e7d5b1b51deb81
Greg Kaiser [Tue, 30 Aug 2016 01:28:32 +0000 (01:28 +0000)]
Merge changes I896af608,I2e2a65bc,I8d9ae8b9,Ibb07666a into nyc-mr1-dev am:
6ef2cee605 am:
bb4fbb631c
am:
32f2d7f838
Change-Id: Ibb33dc23d0db62093ab2f06f3cb8f67201a324ba
Greg Kaiser [Tue, 30 Aug 2016 01:27:18 +0000 (01:27 +0000)]
ContextHubService: Fix app query am:
10163d0dd2 am:
c5ab788398
am:
460ad1b1dd
Change-Id: Id15440ab7b2f8f27069bb411c1a9786472bd30eb
Greg Kaiser [Tue, 30 Aug 2016 01:26:40 +0000 (01:26 +0000)]
ContextHubService: Don't double report app loads am:
fe6d4f518a am:
ca627a8cc3
am:
8c94f54e0f
Change-Id: I34887862a05e0cbe3c21e038c31072cd41f363a3
Greg Kaiser [Tue, 30 Aug 2016 01:25:58 +0000 (01:25 +0000)]
ContextHubService: Make app handle size match Java am:
f8210797ad am:
ddf97f6b1f
am:
6143907a01
Change-Id: I5c29e31f4cb8d9ab736e3f6479e9b1d7c39c810c
Greg Kaiser [Tue, 30 Aug 2016 01:24:27 +0000 (01:24 +0000)]
ContextHubService: Update caches on nanoapp unload am:
0d052c9508 am:
e7a0e1a771
am:
27452edbb1
Change-Id: I1afc8ea3d02b15e330908794346cd8a4a2cbf822
Erik Kline [Tue, 30 Aug 2016 01:24:22 +0000 (01:24 +0000)]
Merge "Add simple NetdService util class" into nyc-mr1-dev am:
592552220b am:
78540f798d
am:
2c2dcaf4fb
Change-Id: Ia8628594a109eb38cbc526192044ccd5f24cbe82
Erik Kline [Tue, 30 Aug 2016 01:24:19 +0000 (01:24 +0000)]
Add simple NetdService util class am:
c1bc0be161 am:
b92c7205dd
am:
1a35a05e56
Change-Id: I8e36534a1e9ad604cc7d7efc491e54c0ea530347
Mark Lu [Tue, 30 Aug 2016 01:24:12 +0000 (01:24 +0000)]
Merge "Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev am:
314d995ca1 am:
b3ab8337df" into nyc-mr1-dev am:
000289bc6c am:
d6cfb23841
am:
437f55d0e6
Change-Id: I298d72f2283084ca64648ca442e76e9231238578
Mark Lu [Tue, 30 Aug 2016 01:24:09 +0000 (01:24 +0000)]
Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev am:
314d995ca1 am:
b3ab8337df am:
4b492cbf09 am:
3e0f9837f3
am:
42ba1a85d3
Change-Id: I769c6be16c288b6e27c13bd8ee122e877709bafb
Mark Lu [Tue, 30 Aug 2016 01:20:38 +0000 (01:20 +0000)]
Merge "docs: Fix typo and broken link in AsyncTask.java am:
53415ff24e am:
bae52ec98c" into nyc-mr1-dev am:
6be20ff728 am:
426a9411a2
am:
e99844d614
Change-Id: I97cf4ff7ca158ef50dab89abae9530dbb64ffd46
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
OSDN Git Service
