OSDN Git Service
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
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
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
Mark Goldstein [Fri, 26 Aug 2016 01:08:37 +0000 (01:08 +0000)]
docs: Fix typo am:
1c22ae296b am:
b348093ec4 am:
60a849ab32
am:
b7f8646cdc
Change-Id: If5fee55f0dc6d06ee77d8e1a06c36680090b664b
Narayan Kamath [Fri, 26 Aug 2016 01:08:25 +0000 (01:08 +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
Change-Id: Ie7f50e6d9c261ef098e045d9ce1f0eddb1e15d6b
Svetoslav Ganov [Fri, 26 Aug 2016 01:08:15 +0000 (01:08 +0000)]
Merge "Fix a regression in sync manager" into nyc-mr1-dev am:
6f1955bf23
am:
166d67b769
Change-Id: Ic3914dba4049b51611c69b8e016bcfe4c31a041b
Svet Ganov [Fri, 26 Aug 2016 01:08:05 +0000 (01:08 +0000)]
Fix a regression in sync manager am:
dfed1c73ec
am:
a09f3790ac
Change-Id: Icd78c91e12a672a00f3ce660abb318997382fd64
Pankaj Kanwar [Fri, 26 Aug 2016 01:07:55 +0000 (01:07 +0000)]
Merge "Show a toast when switching from wifi to Verizon cell data." into nyc-dr1-dev am:
5d06597072 am:
a65318a290
am:
64145a519a
Change-Id: Ic1fec38535d4e7f392716ffee2d88d57492e577a
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
Mark Goldstein [Fri, 26 Aug 2016 01:02:05 +0000 (01:02 +0000)]
docs: Fix typo am:
1c22ae296b
am:
94d4c84f38
Change-Id: Ic95ae48e0ebc693de6114edc2186347deea8145b
Narayan Kamath [Fri, 26 Aug 2016 01:02:00 +0000 (01:02 +0000)]
resolve merge conflicts of
5191225 to mnc-dev am:
1fbc4b8624 am:
8f4f9e4d5e am:
a21569cd76 am:
b0429bbad5 am:
1238ffcd2c
am:
5a56efd888
Change-Id: I9eb6a200394fb945a3b52729f179864f5469eb12
Dianne Hackborn [Fri, 26 Aug 2016 01:01:58 +0000 (01:01 +0000)]
Merge "Try to mitigate issue #
31016187: system_server crash in ArraySet." into nyc-dev am:
184edd6d93
am:
c84e8f39d0
Change-Id: I1c8b9bfb61ce07c39af8dad4f045b691a0fc3fba
Dianne Hackborn [Fri, 26 Aug 2016 01:01:54 +0000 (01:01 +0000)]
Try to mitigate issue #
31016187: system_server crash in ArraySet. am:
dd28b7b5f3
am:
ccc9f7a59e
Change-Id: I9db81c09d11bc50803e85280d310aa7d91bf76f8
Mark Lu [Fri, 26 Aug 2016 01:01:49 +0000 (01:01 +0000)]
Merge "docs: rewrite one attribute description in R.attr" into nyc-dev am:
30cba33a60
am:
7973c74cdc
Change-Id: I1920abb7cde93cda9ba2571aee677fe983d26288
Android Build Merger (Role) [Fri, 26 Aug 2016 00:56:13 +0000 (00:56 +0000)]
Merge "Show a toast when switching from wifi to Verizon cell data. am:
efe0839876 am:
88d4d15d52 am:
b9aa287404" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 26 Aug 2016 00:56:01 +0000 (00:56 +0000)]
Merge "Merge "Try to mitigate issue #
31016187: system_server crash in ArraySet." into nyc-dev am:
184edd6d93 am:
90a6799951 am:
22ad9a3116 am:
4ddb8760b2" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 26 Aug 2016 00:55:51 +0000 (00:55 +0000)]
Merge "Try to mitigate issue #
31016187: system_server crash in ArraySet. am:
dd28b7b5f3 am:
05775d71e6 am:
2eb6e503ea am:
4587f8b4db" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 26 Aug 2016 00:55:42 +0000 (00:55 +0000)]
Merge "Merge "docs: rewrite one attribute description in R.attr" into nyc-dev am:
30cba33a60 am:
40f25f1464 am:
794b9dd366 am:
ccd487a98e" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 26 Aug 2016 00:55:28 +0000 (00:55 +0000)]
Merge "docs: rewrite one attribute description in R.attr am:
5dabf06ae5 am:
6df44a80a3 am:
77d7db4de1 am:
e4daddf599" into nyc-mr1-dev-plus-aosp
Lorenzo Colitti [Fri, 26 Aug 2016 00:54:35 +0000 (00:54 +0000)]
Show a toast when switching from wifi to Verizon cell data. am:
efe0839876 am:
88d4d15d52
am:
b9aa287404
Change-Id: Ia2218f509d940cd2dc100534c6ca6caeca3dc7a2
Dianne Hackborn [Fri, 26 Aug 2016 00:54:30 +0000 (00:54 +0000)]
Merge "Try to mitigate issue #
31016187: system_server crash in ArraySet." into nyc-dev am:
184edd6d93 am:
90a6799951 am:
22ad9a3116
am:
4ddb8760b2
Change-Id: I2b73740fc01a1699622f8237acf90fc5bbaaf53c
Dianne Hackborn [Fri, 26 Aug 2016 00:54:26 +0000 (00:54 +0000)]
Try to mitigate issue #
31016187: system_server crash in ArraySet. am:
dd28b7b5f3 am:
05775d71e6 am:
2eb6e503ea
am:
4587f8b4db
Change-Id: I91f3a624033f36ab77d3cc614cfd133735261adb
Mark Lu [Fri, 26 Aug 2016 00:54:22 +0000 (00:54 +0000)]
Merge "docs: rewrite one attribute description in R.attr" into nyc-dev am:
30cba33a60 am:
40f25f1464 am:
794b9dd366
am:
ccd487a98e
Change-Id: Ib8fcd1cef798e084b42ebdd9b3dc86e11b0ffee5
Mark Lu [Fri, 26 Aug 2016 00:54:15 +0000 (00:54 +0000)]
docs: rewrite one attribute description in R.attr am:
5dabf06ae5 am:
6df44a80a3 am:
77d7db4de1
am:
e4daddf599
Change-Id: Idc96dde0a5464b5ae61af2f89b4809e281a0a577
Android Build Merger (Role) [Fri, 26 Aug 2016 00:53:04 +0000 (00:53 +0000)]
Merge "docs: rewrite one attribute description in R.attr am:
5dabf06ae5 am:
833d07e53a" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 26 Aug 2016 00:52:52 +0000 (00:52 +0000)]
Merge "Merge "docs: fix broken links in Activity reference" into nyc-dev am:
d428a012ba am:
6446e88183" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 26 Aug 2016 00:52:39 +0000 (00:52 +0000)]
Merge "docs: fix broken links in Activity reference am:
fa43485910 am:
c4e81b64f1" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 26 Aug 2016 00:52:28 +0000 (00:52 +0000)]
Merge "Merge "docs: fix code snippets in SQL Databases page" into nyc-dev am:
209fb02f84 am:
228b5f6fb4" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 26 Aug 2016 00:52:17 +0000 (00:52 +0000)]
Merge "docs: fix code snippets in SQL Databases page am:
95698f127a am:
3de2eff9d5" into nyc-mr1-dev-plus-aosp
Mark Lu [Fri, 26 Aug 2016 00:51:04 +0000 (00:51 +0000)]
docs: rewrite one attribute description in R.attr am:
5dabf06ae5
am:
833d07e53a
Change-Id: Id83147a7221df5f52778357b74d67f1f4f07ee77
Mark Lu [Fri, 26 Aug 2016 00:51:00 +0000 (00:51 +0000)]
Merge "docs: fix broken links in Activity reference" into nyc-dev am:
d428a012ba
am:
6446e88183
Change-Id: I29a8a296c3520c31fd822eb527467de3b8b09d72
Mark Lu [Fri, 26 Aug 2016 00:50:58 +0000 (00:50 +0000)]
docs: fix broken links in Activity reference am:
fa43485910
am:
c4e81b64f1
Change-Id: I5968ffa6cbe316404352ab4b41457ae746a74b57
Mark Lu [Fri, 26 Aug 2016 00:50:54 +0000 (00:50 +0000)]
Merge "docs: fix code snippets in SQL Databases page" into nyc-dev am:
209fb02f84
am:
228b5f6fb4
Change-Id: I8f01887163980434e41558935c8e264ee4bce0b0
Mark Lu [Fri, 26 Aug 2016 00:50:52 +0000 (00:50 +0000)]
docs: fix code snippets in SQL Databases page am:
95698f127a
am:
3de2eff9d5
Change-Id: Ic32940a6a3a8628d38eb96fb1c6587201e8f43ad
Mark Lu [Fri, 26 Aug 2016 00:50:18 +0000 (00:50 +0000)]
Merge "docs: fix broken links in Activity reference" into nyc-dev am:
d428a012ba am:
5c83071228 am:
7c71a2fa10
am:
1f3ded459b
Change-Id: Ic6d93c9eed19c52dd55c1d1a2dc8bee347b75b91
Mark Lu [Fri, 26 Aug 2016 00:50:13 +0000 (00:50 +0000)]
docs: fix broken links in Activity reference am:
fa43485910 am:
497c2907fd am:
eab610d0a6
am:
b03a1b8b25
Change-Id: Iadf3e62a1e8b93ead2e341644a7b0f6f0ee0e17d
Mark Lu [Fri, 26 Aug 2016 00:50:07 +0000 (00:50 +0000)]
Merge "docs: fix code snippets in SQL Databases page" into nyc-dev am:
209fb02f84 am:
f858ebf9db am:
d478856ca8
am:
6bd5be87fb
Change-Id: I7111cf911ab296de06240dc7d0ceef1318c62fb4
Mark Lu [Fri, 26 Aug 2016 00:49:38 +0000 (00:49 +0000)]
docs: fix code snippets in SQL Databases page am:
95698f127a am:
6f5cf3fb0d am:
da8624a129
am:
43c71f3988
Change-Id: Ic945eced3a239327880d52a26e8d4a811e20a189
Hemal Patel [Fri, 26 Aug 2016 00:49:25 +0000 (00:49 +0000)]
Docs: Fixed the Bluetooth guide link am:
65813dff14 am:
a544221abd am:
d6a64d788b am:
42708fa473
am:
ac438b21ba
Change-Id: Ie8938cdf40afd7a1925c23526965d6d66664fcc3
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
OSDN Git Service
