OSDN Git Service
Greg Kaiser [Fri, 26 Aug 2016 03:53:34 +0000 (03:53 +0000)]
Merge "ContextHubService: Maintain hub result meaning" into nyc-mr1-dev am:
18e59f2988
am:
d06faffad8
Change-Id: I68d8d5463e73c5a30ea18f0009f7e7f48d28a0df
Greg Kaiser [Fri, 26 Aug 2016 03:53:30 +0000 (03:53 +0000)]
ContextHubService: Maintain hub result meaning am:
6d9e7f669a
am:
9ea48989ce
Change-Id: Ida814c62b773f6d0c27f4d4e6fd048ee2a23efc8
Greg Kaiser [Fri, 26 Aug 2016 03:53:25 +0000 (03:53 +0000)]
Merge "ContextHubManager: Fix API documentation." into nyc-mr1-dev am:
1e07e392c3
am:
d5b81eb77d
Change-Id: I4a2f9c3900c5aadf86ff8d2e51dcfa490eed9d3f
Greg Kaiser [Fri, 26 Aug 2016 03:53:20 +0000 (03:53 +0000)]
ContextHubManager: Fix API documentation. am:
fac5be2ace
am:
921e7ef350
Change-Id: Ib9e190657238ac5663ba96e87b27615e4ea085a6
Greg Kaiser [Fri, 26 Aug 2016 03:48:17 +0000 (03:48 +0000)]
Merge changes I896af608,I2e2a65bc,I8d9ae8b9,Ibb07666a into nyc-mr1-dev am:
6ef2cee605
am:
bb4fbb631c
Change-Id: I73de1171c003098becc51994040e03212abeca5d
Greg Kaiser [Fri, 26 Aug 2016 03:47:44 +0000 (03:47 +0000)]
ContextHubService: Fix app query am:
10163d0dd2
am:
c5ab788398
Change-Id: I4c01c7f9ebb8c3258f29c3ffe73a42fed0fccfb6
Greg Kaiser [Fri, 26 Aug 2016 03:46:56 +0000 (03:46 +0000)]
ContextHubService: Don't double report app loads am:
fe6d4f518a
am:
ca627a8cc3
Change-Id: Ief0783ce04972f00e7ed3637bf3bf54b78e5c55e
Greg Kaiser [Fri, 26 Aug 2016 03:45:38 +0000 (03:45 +0000)]
ContextHubService: Make app handle size match Java am:
f8210797ad
am:
ddf97f6b1f
Change-Id: I0c8209312a757bc00e2776783e45af33651e0783
Greg Kaiser [Fri, 26 Aug 2016 03:45:02 +0000 (03:45 +0000)]
ContextHubService: Update caches on nanoapp unload am:
0d052c9508
am:
e7a0e1a771
Change-Id: I217286efe8e68297cca1354f33ae9bbdde52f58b
Greg Kaiser [Fri, 26 Aug 2016 03:44:43 +0000 (03:44 +0000)]
Merge "ContextHubService: Maintain hub result meaning" into nyc-mr1-dev
am:
18e59f2988
Change-Id: Ieaa91254179764a9f15fc7268e83288ad2d4caec
Greg Kaiser [Fri, 26 Aug 2016 03:44:41 +0000 (03:44 +0000)]
ContextHubService: Maintain hub result meaning
am:
6d9e7f669a
Change-Id: I83f2e46782458cf9ac0af8b6f6e07fe8de054425
Greg Kaiser [Fri, 26 Aug 2016 03:37:15 +0000 (03:37 +0000)]
Merge "ContextHubManager: Fix API documentation." into nyc-mr1-dev
am:
1e07e392c3
Change-Id: I03e23ebfe2a29aecc77048edd56797f9fcf24899
Greg Kaiser [Fri, 26 Aug 2016 03:37:12 +0000 (03:37 +0000)]
ContextHubManager: Fix API documentation.
am:
fac5be2ace
Change-Id: I220af0f42791d1210acf9e88da670994f3c6ae45
Greg Kaiser [Fri, 26 Aug 2016 03:37:08 +0000 (03:37 +0000)]
Merge changes I896af608,I2e2a65bc,I8d9ae8b9,Ibb07666a into nyc-mr1-dev
am:
6ef2cee605
Change-Id: Iba80d00347392e94d99f5b17deeb8bbf6feaaea1
Greg Kaiser [Fri, 26 Aug 2016 03:37:06 +0000 (03:37 +0000)]
ContextHubService: Fix app query
am:
10163d0dd2
Change-Id: I16ab808c4b8b132e132cbcb6fdcaa76382539356
Greg Kaiser [Fri, 26 Aug 2016 03:36:37 +0000 (03:36 +0000)]
ContextHubService: Don't double report app loads
am:
fe6d4f518a
Change-Id: I00d7537e70ea97c57d4a8e05a05000418c64339e
Greg Kaiser [Fri, 26 Aug 2016 03:35:52 +0000 (03:35 +0000)]
ContextHubService: Make app handle size match Java
am:
f8210797ad
Change-Id: Ia260db17bfe5ee95ab841404a5cada7acce5001e
Greg Kaiser [Fri, 26 Aug 2016 03:34:41 +0000 (03:34 +0000)]
ContextHubService: Update caches on nanoapp unload
am:
0d052c9508
Change-Id: I79ea5f8bba8b0654befb918680db16bda7577f8d
Greg Kaiser [Fri, 26 Aug 2016 03:34:04 +0000 (03:34 +0000)]
Merge "ContextHubService: Maintain hub result meaning" into nyc-mr1-dev
Greg Kaiser [Fri, 26 Aug 2016 03:30:16 +0000 (03:30 +0000)]
Merge "ContextHubManager: Fix API documentation." into nyc-mr1-dev
Greg Kaiser [Fri, 26 Aug 2016 03:29:19 +0000 (03:29 +0000)]
Merge changes I896af608,I2e2a65bc,I8d9ae8b9,Ibb07666a into nyc-mr1-dev
* changes:
ContextHubService: Fix app query
ContextHubService: Don't double report app loads
ContextHubService: Make app handle size match Java
ContextHubService: Update caches on nanoapp unload
Erik Kline [Fri, 26 Aug 2016 01:50:36 +0000 (01:50 +0000)]
Merge "Add simple NetdService util class" into nyc-mr1-dev am:
592552220b
am:
78540f798d
Change-Id: Iab09737b953d8e3383f11f981793f473239c4a6b
Erik Kline [Fri, 26 Aug 2016 01:50:31 +0000 (01:50 +0000)]
Add simple NetdService util class am:
c1bc0be161
am:
b92c7205dd
Change-Id: I82df82eee9d79ffee6a44fc9d77ff2fea713a4b6
Erik Kline [Fri, 26 Aug 2016 01:45:32 +0000 (01:45 +0000)]
Merge "Add simple NetdService util class" into nyc-mr1-dev
am:
592552220b
Change-Id: I561fff2d631a76fbd1abdb10a1b8c4466ebe2cc4
Erik Kline [Fri, 26 Aug 2016 01:45:29 +0000 (01:45 +0000)]
Add simple NetdService util class
am:
c1bc0be161
Change-Id: I67d1ecda70efca7b47d6ebfb79c7da941d51965e
Erik Kline [Fri, 26 Aug 2016 01:40:56 +0000 (01:40 +0000)]
Merge "Add simple NetdService util class" into nyc-mr1-dev
Mark Lu [Fri, 26 Aug 2016 01:35:50 +0000 (01:35 +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
Change-Id: I9070aff36165453a6ae65775224a12229baeff5a
Mark Lu [Fri, 26 Aug 2016 01:29:22 +0000 (01:29 +0000)]
Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev am:
314d995ca1 am:
b3ab8337df am:
4b492cbf09
am:
3e0f9837f3
Change-Id: Ie32c4dca0bee286ab44367ff18c516219b8e6c3f
Mark Lu [Fri, 26 Aug 2016 01:29:18 +0000 (01:29 +0000)]
Merge "docs: Fix typo and broken link in AsyncTask.java am:
53415ff24e am:
bae52ec98c" into nyc-mr1-dev am:
6be20ff728
am:
426a9411a2
Change-Id: Ibe1229f61e1abf22249bdff149c3e274fb1ca170
Mark Lu [Fri, 26 Aug 2016 01:29:14 +0000 (01:29 +0000)]
docs: Fix typo and broken link in AsyncTask.java am:
53415ff24e am:
bae52ec98c am:
86caa4aebf
am:
b48098f836
Change-Id: I4b05e82124db8806d5d4eb6622bd107d5d038456
Winson Chung [Fri, 26 Aug 2016 01:29:10 +0000 (01:29 +0000)]
Merge "Fixing typo in dump log." into nyc-mr1-dev am:
5ebd73f8ff
am:
ba4744bc08
Change-Id: I595e3d60cbfb84ea0b257635c9ffaf9d98b3c4c9
Winson [Fri, 26 Aug 2016 01:29:06 +0000 (01:29 +0000)]
Fixing typo in dump log. am:
b43ba86811
am:
1de1a3bfcc
Change-Id: I0ccfedd4bc9028ab150792ba974a1f70912ef631
Mark Lu [Fri, 26 Aug 2016 01:26:33 +0000 (01:26 +0000)]
Merge "docs: fix link in Loader reference page" into nyc-dev am:
3c638c1ea1 am:
ceaef72fb9 am:
a5f090a768
am:
975704a737
Change-Id: I13fe67ed9d59918f36d33befc3d285d3a60cde6d
Mark Lu [Fri, 26 Aug 2016 01:26:29 +0000 (01:26 +0000)]
docs: fix link in Loader reference page am:
9f52b7a4a8 am:
f496b9a981 am:
e16c82d224
am:
bfe0c86461
Change-Id: I8e4c19a43179c2816393929d1dff76f57a68185a
Suprabh Shukla [Fri, 26 Aug 2016 01:26:25 +0000 (01:26 +0000)]
Merge "Resolving race condition while writing recent taskids" into nyc-mr1-dev am:
769bc6c8b1
am:
9dbdbf461e
Change-Id: I1e1e59ffd721807729bc9692767214d86faf0f90
Suprabh Shukla [Fri, 26 Aug 2016 01:26:22 +0000 (01:26 +0000)]
Resolving race condition while writing recent taskids am:
fd0bd4f39d
am:
c9e7c49def
Change-Id: Ib52cdb13519da68f04e3581cd6e3bb5dd796b12c
Sudheer Shanka [Fri, 26 Aug 2016 01:26:17 +0000 (01:26 +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
Change-Id: I7320b8af540b246dd3c74963ea001bacabe0dab2
Android Build Merger (Role) [Fri, 26 Aug 2016 01:23:03 +0000 (01:23 +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
Android Build Merger (Role) [Fri, 26 Aug 2016 01:22:49 +0000 (01:22 +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
Android Build Merger (Role) [Fri, 26 Aug 2016 01:22:35 +0000 (01:22 +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
Android Build Merger (Role) [Fri, 26 Aug 2016 01:22:17 +0000 (01:22 +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
Android Build Merger (Role) [Fri, 26 Aug 2016 01:22:04 +0000 (01:22 +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
Sudheer Shanka [Fri, 26 Aug 2016 01:21:10 +0000 (01:21 +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
Change-Id: I10401ad30ecb89cd75e66297d22d92dcf5f3a0b9
Sudheer Shanka [Fri, 26 Aug 2016 01:21:06 +0000 (01:21 +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
Change-Id: Id236d24f004932ce6d103a084f520bf7834cb51a
Sudheer Shanka [Fri, 26 Aug 2016 01:21:02 +0000 (01:21 +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
Change-Id: Ie463c5ce2b22b371ecde5d137cdd6ecf0c775d34
Amith Yamasani [Fri, 26 Aug 2016 01:20:58 +0000 (01:20 +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
Change-Id: Ibaa9d0cb12eae2180eef3133f418845e4edbe207
Amith Yamasani [Fri, 26 Aug 2016 01:20:55 +0000 (01:20 +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
Change-Id: I2ae37c82ae8a36d026b3b18f9706674e49a5881f
Android Build Merger (Role) [Fri, 26 Aug 2016 01:18:58 +0000 (01: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:
12a668fde8 am:
148acfcb45 am:
cb6f2eeb33" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 26 Aug 2016 01:18:48 +0000 (01: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 am:
6a9490f850 am:
380d9b9486 am:
ea35f92f98 am:
d5be8af093" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 26 Aug 2016 01:18:36 +0000 (01:18 +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
Android Build Merger (Role) [Fri, 26 Aug 2016 01:18:27 +0000 (01:18 +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
Android Build Merger (Role) [Fri, 26 Aug 2016 01:18:17 +0000 (01:18 +0000)]
Merge "Merge "docs: Fix typo" into nyc-dev am:
8d660eebad am:
e24079f5b2 am:
b354b01acf am:
0f91a8a84e" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 26 Aug 2016 01:17:29 +0000 (01:17 +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
Sudheer Shanka [Fri, 26 Aug 2016 01:17:24 +0000 (01:17 +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
Change-Id: Iae704781bff879042d1767db0236bccdba36c417
Android Build Merger (Role) [Fri, 26 Aug 2016 01:17:18 +0000 (01:17 +0000)]
Merge "docs: Fix typo and broken link in AsyncTask.java am:
53415ff24e am:
fc68813e5c" into nyc-mr1-dev-plus-aosp
Sudheer Shanka [Fri, 26 Aug 2016 01:17:15 +0000 (01:17 +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
Change-Id: Id72d3b9599a2effa92f49fd0b1ea254a95414efa
Android Build Merger (Role) [Fri, 26 Aug 2016 01:17:09 +0000 (01:17 +0000)]
Merge "Merge "docs: fix link in Loader reference page" into nyc-dev am:
3c638c1ea1 am:
09e4d9bada" into nyc-mr1-dev-plus-aosp
Amith Yamasani [Fri, 26 Aug 2016 01:17:05 +0000 (01:17 +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
Change-Id: I1eb801d1465392113b0cb6844f584c94f2c94a63
Android Build Merger (Role) [Fri, 26 Aug 2016 01:16:53 +0000 (01:16 +0000)]
Merge "docs: fix link in Loader reference page am:
9f52b7a4a8 am:
c6612637bb" into nyc-mr1-dev-plus-aosp
Amith Yamasani [Fri, 26 Aug 2016 01:16:53 +0000 (01:16 +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
Change-Id: I3222d859ad4d9889e03490a61ceb922554350041
Android Build Merger (Role) [Fri, 26 Aug 2016 01:16:44 +0000 (01:16 +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
Mark Goldstein [Fri, 26 Aug 2016 01:16:42 +0000 (01:16 +0000)]
Merge "docs: Fix typo" into nyc-dev am:
8d660eebad am:
e24079f5b2 am:
b354b01acf
am:
0f91a8a84e
Change-Id: Id88807906702a743c4635935c4dd2f77d5c25327
Mark Lu [Fri, 26 Aug 2016 01:15:56 +0000 (01:15 +0000)]
Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev am:
314d995ca1
am:
c9fbef739f
Change-Id: I84a2ecf7a928c75374676a97bf70981482ae9609
Mark Lu [Fri, 26 Aug 2016 01:15:54 +0000 (01:15 +0000)]
docs: Fix typo and broken link in AsyncTask.java am:
53415ff24e
am:
fc68813e5c
Change-Id: I1be966d00de19afcef968093e0583e6da1eaff98
Mark Lu [Fri, 26 Aug 2016 01:15:51 +0000 (01:15 +0000)]
Merge "docs: fix link in Loader reference page" into nyc-dev am:
3c638c1ea1
am:
09e4d9bada
Change-Id: I4a046708b8abe35cf63c65bab336a79e83530ec7
Mark Lu [Fri, 26 Aug 2016 01:15:49 +0000 (01:15 +0000)]
docs: fix link in Loader reference page am:
9f52b7a4a8
am:
c6612637bb
Change-Id: I0472093b0019a421319c2acf29a4e36b87e75cd6
Sudheer Shanka [Fri, 26 Aug 2016 01:15:45 +0000 (01:15 +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
Change-Id: Ic60e4ff0cf841e0ec895f46383e1d09da76e37dc
Android Build Merger (Role) [Fri, 26 Aug 2016 01:14:34 +0000 (01:14 +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
Android Build Merger (Role) [Fri, 26 Aug 2016 01:14:25 +0000 (01:14 +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
Android Build Merger (Role) [Fri, 26 Aug 2016 01:14:17 +0000 (01:14 +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
Android Build Merger (Role) [Fri, 26 Aug 2016 01:14:08 +0000 (01:14 +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
Android Build Merger (Role) [Fri, 26 Aug 2016 01:13:56 +0000 (01:13 +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
Sudheer Shanka [Fri, 26 Aug 2016 01:13:08 +0000 (01:13 +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
Change-Id: If61f0efa94d8aa22aa2ed32af29478350ca5ffa0
Sudheer Shanka [Fri, 26 Aug 2016 01:13:06 +0000 (01:13 +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
Change-Id: I7abaf47bbd4f66ef38981271da0d6acb194fc0ec
Sudheer Shanka [Fri, 26 Aug 2016 01:13:04 +0000 (01:13 +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
Change-Id: Ia3df80208c9d394b9d29df28e650aa94d4d41e94
Amith Yamasani [Fri, 26 Aug 2016 01:13:02 +0000 (01:13 +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
Change-Id: I31214f748c3e4c59e270ae2c59abf3dc9081b702
Amith Yamasani [Fri, 26 Aug 2016 01:12:59 +0000 (01:12 +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
Change-Id: I8f0cf1a7603376804a9a1fd84991baf8800c0887
Mark Lu [Fri, 26 Aug 2016 01:12:19 +0000 (01:12 +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
Change-Id: I10b8f167ea4a50de0d3618042943967cc7d2796c
Mark Lu [Fri, 26 Aug 2016 01:12:17 +0000 (01:12 +0000)]
Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev am:
314d995ca1 am:
b3ab8337df
am:
4b492cbf09
Change-Id: I8cb4b23b821f2d7c9b9de08a9d3bcc1e8b73552e
Mark Lu [Fri, 26 Aug 2016 01:12:11 +0000 (01:12 +0000)]
Merge "docs: Fix typo and broken link in AsyncTask.java am:
53415ff24e am:
bae52ec98c" into nyc-mr1-dev
am:
6be20ff728
Change-Id: I600749a9f808f801823ec1582448854522b2e292
Mark Lu [Fri, 26 Aug 2016 01:12:09 +0000 (01:12 +0000)]
docs: Fix typo and broken link in AsyncTask.java am:
53415ff24e am:
bae52ec98c
am:
86caa4aebf
Change-Id: Ib44ae881aefaac87625dc86c14f6144f0f7d2fbc
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
Android Build Merger (Role) [Fri, 26 Aug 2016 01:11:24 +0000 (01:11 +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
Android Build Merger (Role) [Fri, 26 Aug 2016 01:11:16 +0000 (01:11 +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
Android Build Merger (Role) [Fri, 26 Aug 2016 01:11:06 +0000 (01:11 +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
Android Build Merger (Role) [Fri, 26 Aug 2016 01:10:57 +0000 (01:10 +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
Android Build Merger (Role) [Fri, 26 Aug 2016 01:10:48 +0000 (01:10 +0000)]
Merge "Merge "docs: Fix typo" into nyc-dev am:
8d660eebad am:
7843568a38" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 26 Aug 2016 01:10:14 +0000 (01:10 +0000)]
Merge "docs: Fix typo am:
1c22ae296b am:
b348093ec4 am:
60a849ab32 am:
b7f8646cdc" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 26 Aug 2016 01:10:00 +0000 (01:10 +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
Sudheer Shanka [Fri, 26 Aug 2016 01:09:56 +0000 (01: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" into nyc-dev am:
555fbf30d2
am:
80f80e7e70
Change-Id: Ib90e92d36b854e7deb0583f0fd0329138f9b6628
Sudheer Shanka [Fri, 26 Aug 2016 01:09:53 +0000 (01: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
Change-Id: I907b9dc6996a268b592db3a1b8ca8cfab8ef63e6
Android Build Merger (Role) [Fri, 26 Aug 2016 01:09:51 +0000 (01:09 +0000)]
Merge "Merge "Fix a regression in sync manager" into nyc-mr1-dev am:
6f1955bf23 am:
166d67b769" into nyc-mr1-dev-plus-aosp
Amith Yamasani [Fri, 26 Aug 2016 01:09:50 +0000 (01:09 +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
Change-Id: I8f28cf66bb0b7951f0e9157a42d257967cd988ba
Amith Yamasani [Fri, 26 Aug 2016 01:09:48 +0000 (01:09 +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
Change-Id: I1a3b1c0965d94de7236c6b12fde47a55c95d430e
Mark Goldstein [Fri, 26 Aug 2016 01:09:45 +0000 (01:09 +0000)]
Merge "docs: Fix typo" into nyc-dev am:
8d660eebad
am:
7843568a38
Change-Id: Ia40f0924550ad1a3a923d93c4d4dc60f6ec1416c
Android Build Merger (Role) [Fri, 26 Aug 2016 01:09:42 +0000 (01:09 +0000)]
Merge "Fix a regression in sync manager am:
dfed1c73ec am:
a09f3790ac" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 26 Aug 2016 01:09:34 +0000 (01:09 +0000)]
Merge "Merge "Show a toast when switching from wifi to Verizon cell data." into nyc-dr1-dev am:
5d06597072 am:
a65318a290 am:
64145a519a" into nyc-mr1-dev-plus-aosp
OSDN Git Service
