OSDN Git Service
TreeHugger Robot [Tue, 20 Feb 2018 18:01:54 +0000 (18:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Tue, 20 Feb 2018 05:39:40 +0000 (21:39 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I2f3e741047207c9948bbda977800e4a10b5797c1
Bill Yi [Tue, 20 Feb 2018 05:25:11 +0000 (05:25 +0000)]
Merge changes from topic "am-
b69199ef-52eb-434d-a231-
8cb19da641fc" into oc-dev am:
a1f536e00e
am:
ff1a55a207
Change-Id: Ibcd4efc7c50a91c6dd401436a2d82171793e0e6b
Bill Yi [Tue, 20 Feb 2018 05:19:47 +0000 (05:19 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4c87ffeae2 skipped:
2aaa34b639 am:
7b73069b0a -s ours
am:
6f40fc77e6 -s ours
Change-Id: I9f0d46d5dcd235ab83f52cfe6b21ad780d8404c5
Bill Yi [Tue, 20 Feb 2018 05:12:59 +0000 (05:12 +0000)]
Merge changes from topic "am-
8dbc037c-490f-442d-957b-
fea681fe1136" into oc-dev am:
dd05e2d932
am:
ea5b2a818d
Change-Id: I824e17d5fcf0fcd7865d151a7d32b4991f045399
Bill Yi [Tue, 20 Feb 2018 05:09:31 +0000 (05:09 +0000)]
Merge changes from topic "am-
b69199ef-52eb-434d-a231-
8cb19da641fc" into oc-dev
am:
a1f536e00e
Change-Id: Ic19ff34e840d35ea8e93305b8b323c9bdb81b058
Bill Yi [Tue, 20 Feb 2018 05:08:15 +0000 (05:08 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4c87ffeae2 skipped:
2aaa34b639
am:
7b73069b0a -s ours
Change-Id: I93eef5aeb3e029a70f602c145604a3320c219ddf
Bill Yi [Tue, 20 Feb 2018 05:08:10 +0000 (05:08 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
fb5d1738dd skipped:
0b7e5c37cc am:
023ae30cdd -s ours
am:
16e78b6dc1 -s ours
Change-Id: I67ed476e1375dba6a1c5864f561498c9e259c052
Bill Yi [Tue, 20 Feb 2018 05:03:09 +0000 (05:03 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a4513689c8 skipped:
baff683653 am:
42e8a0c2de -s ours
am:
da0d89bf92 -s ours
Change-Id: I76ad6438afad284c3eed8d4a86111870865a7253
Bill Yi [Tue, 20 Feb 2018 05:02:56 +0000 (05:02 +0000)]
Merge changes from topic "am-
8dbc037c-490f-442d-957b-
fea681fe1136" into oc-dev
am:
dd05e2d932
Change-Id: I149351dee948b64a4ee4de1512ea98d7692afdf6
Bill Yi [Tue, 20 Feb 2018 05:01:34 +0000 (05:01 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
fb5d1738dd skipped:
0b7e5c37cc
am:
023ae30cdd -s ours
Change-Id: Id625fa8ab91f53283f0e5985f13141e54d2dfe8e
Bill Yi [Tue, 20 Feb 2018 04:56:46 +0000 (04:56 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a4513689c8 skipped:
baff683653
am:
42e8a0c2de -s ours
Change-Id: I21df47ac8511c2003fa9dd0c07065cb8f7cb8b28
TreeHugger Robot [Tue, 20 Feb 2018 04:54:20 +0000 (04:54 +0000)]
Merge changes from topic "am-
b69199ef-52eb-434d-a231-
8cb19da641fc" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
4c87ffeae2 skipped:
2aaa34b639
[automerger skipped] Import translations. DO NOT MERGE skipped:
4c87ffeae2
Import translations. DO NOT MERGE
TreeHugger Robot [Tue, 20 Feb 2018 04:53:51 +0000 (04:53 +0000)]
Merge changes from topic "am-
8dbc037c-490f-442d-957b-
fea681fe1136" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
fb5d1738dd skipped:
0b7e5c37cc
[automerger skipped] Import translations. DO NOT MERGE skipped:
fb5d1738dd
Import translations. DO NOT MERGE
Android Build Merger (Role) [Mon, 19 Feb 2018 17:17:18 +0000 (17:17 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
fb5d1738dd skipped:
0b7e5c37cc
Change-Id: Ie880a7487ed875a62e4fab4974da4a35d3c6b8b4
Android Build Merger (Role) [Mon, 19 Feb 2018 17:17:12 +0000 (17:17 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
fb5d1738dd
Change-Id: I70b8b1c9fab0c7ae88a9a5f839ee411b28fd4f19
Bill Yi [Mon, 19 Feb 2018 17:16:47 +0000 (09:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2e31731c8393cbcd58b57cc4092d14626e60af8b
Auto-generated-cl: translation import
Android Build Merger (Role) [Mon, 19 Feb 2018 16:08:26 +0000 (16:08 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a4513689c8 skipped:
baff683653
Change-Id: Ie898f10574d4deb9d465e70803b1b6f24e69e867
Android Build Merger (Role) [Mon, 19 Feb 2018 16:08:19 +0000 (16:08 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a4513689c8
Change-Id: Ib38e6fcc936beb2c72afb46b6e302b4ca261ce14
Bill Yi [Mon, 19 Feb 2018 16:07:44 +0000 (08:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1b9d68a390483f6259a7eb05a2e337af617896b6
Auto-generated-cl: translation import
Android Build Merger (Role) [Mon, 19 Feb 2018 15:09:11 +0000 (15:09 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4c87ffeae2 skipped:
2aaa34b639
Change-Id: I0ed2f3e40aeaaff5acfbbef02155450747169397
Android Build Merger (Role) [Mon, 19 Feb 2018 15:09:03 +0000 (15:09 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4c87ffeae2
Change-Id: I89781e9b815f8fdee167b1427aec4dee233f5530
Bill Yi [Mon, 19 Feb 2018 15:08:29 +0000 (07:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6076b206d8c838472c2c958d521ece8038e10206
Auto-generated-cl: translation import
Bill Yi [Sat, 17 Feb 2018 04:01:02 +0000 (20:01 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I54b1c06d488c0fdae78a4aec9629b6bcc9db9f07
Siyamed Sinir [Thu, 15 Feb 2018 00:43:01 +0000 (00:43 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f am:
7db4a90e60 skipped:
aa9c801f89 am:
1fd506a340
am:
bb0a801a85
Change-Id: I872e5511439ee880f7837a06d5449f556ffb1ebc
Siyamed Sinir [Thu, 15 Feb 2018 00:31:11 +0000 (00:31 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f am:
7db4a90e60 skipped:
aa9c801f89
am:
1fd506a340
Change-Id: I882d9d4190e2f448a0595192c68ac6caf8ee4607
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:21 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f am:
7db4a90e60 skipped:
aa9c801f89
Change-Id: I0d1636b652adf1db5ebd67eb9bb467d3abd84b26
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:16 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f am:
7db4a90e60
Change-Id: Ib5ae0b8558fb647407e5a836b6835e1a5d9f6753
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:11 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f
Change-Id: I27c9d607c6b3b7ae5126a9bb22cdb4ea18963918
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:07 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4
Change-Id: Iac5a694469e6c111f204df6c58446a45cf0ada7c
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:02 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761
Change-Id: Ie5d077cba11b7b9277f4fbce046e571a01535c3c
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:54 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35
Change-Id: If169e52215ed3a3428d4ff4e834f635f7b0f30e1
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:49 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0
Change-Id: I80463ee5315c2672e812659192b227c8271e9113
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:43 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a
Change-Id: Ic83a666bae330bea031b95233079e1493c02c9b3
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:38 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3
Change-Id: Ib622af453781a1769e820c10d6ab46c140809c57
TreeHugger Robot [Fri, 9 Feb 2018 22:27:53 +0000 (22:27 +0000)]
Merge "Prevent AAPT from versioning <animated-selector> tags." into oc-mr1-dev
Eric Enslen [Thu, 8 Feb 2018 02:03:53 +0000 (18:03 -0800)]
fix isActiveNetworkMetered with VPNs
Bug:
72871435
Test: flashed and verified, also ran runtest framework-net
Change-Id: I69319a7db269489053426bb2d41574180be2d43d
Etan Cohen [Thu, 8 Feb 2018 09:45:54 +0000 (09:45 +0000)]
[automerger] Merge "Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am:
50d4e94767" into cw-f-dev am:
9e5c21243c am:
5a590c68df am:
ad8bae1b73
am:
84f311b805
Change-Id: Idb48480b8075f4e11cd47b06ddb9fb4816815433
Etan Cohen [Thu, 8 Feb 2018 09:23:39 +0000 (09:23 +0000)]
[automerger] Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am:
50d4e94767 am:
1aab54a3a3 am:
3979121a99 am:
d1e93e361c
am:
bd7573db8f
Change-Id: I6aa8290672e9df9a99e7346e9df86c03e64cda58
Etan Cohen [Thu, 8 Feb 2018 09:06:07 +0000 (09:06 +0000)]
[automerger] Merge "Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am:
50d4e94767" into cw-f-dev am:
9e5c21243c am:
5a590c68df
am:
ad8bae1b73
Change-Id: I8f4db5b6b97eca28404de8fc990c18f9a8f50575
Etan Cohen [Thu, 8 Feb 2018 09:01:28 +0000 (09:01 +0000)]
[automerger] Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-dev am:
fa72a625cc am:
cdc187ee10 am:
363b273e9a am:
0c8b40873e am:
d2428ebae4 am:
bc7bb6c274
am:
7c2ccdd777
Change-Id: I61d28182d86e1655d078ff9cb8c3ba001cc6c9ae
Etan Cohen [Thu, 8 Feb 2018 08:45:32 +0000 (08:45 +0000)]
[automerger] Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am:
50d4e94767 am:
1aab54a3a3 am:
3979121a99
am:
d1e93e361c
Change-Id: Ice0a36135954e952b307b7ee909ec4add3c5d6ee
Etan Cohen [Thu, 8 Feb 2018 08:35:03 +0000 (08:35 +0000)]
Merge "Merge changes from topic "am-
02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev am:
39e6bc7495" into oc-dev am:
d0adbcb4e2
am:
655059b334
Change-Id: I15de97114e5e3ac7c2ff24c0c7c4c4a9dddd89cc
Etan Cohen [Thu, 8 Feb 2018 08:25:53 +0000 (08:25 +0000)]
[automerger] Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-dev am:
fa72a625cc am:
cdc187ee10 am:
363b273e9a am:
0c8b40873e am:
d2428ebae4
am:
bc7bb6c274
Change-Id: I1f8ded34983a29bde17ffd1927a11fb67becb38e
Etan Cohen [Thu, 8 Feb 2018 08:07:30 +0000 (08:07 +0000)]
Merge "Merge changes from topic "am-
02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev am:
39e6bc7495" into oc-dev
am:
d0adbcb4e2
Change-Id: I287c62a8b83662ba112809ce2aa07c5a3f04fb6d
Etan Cohen [Thu, 8 Feb 2018 07:59:23 +0000 (07:59 +0000)]
[automerger] Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-mr1-dev am:
bd629f69ed am:
1d10387f0d am:
7f4440640b am:
5c777fbcef
am:
fa6d41a295
Change-Id: Iae246cb8b7601877b4d74b2940ca01847cae5a4c
Etan Cohen [Thu, 8 Feb 2018 07:34:43 +0000 (07:34 +0000)]
Merge changes from topic "am-
075f69afbbda4610b4adfcdcb0fd78fc" into oc-dev am:
8e5ec12799
am:
b6eed228bc
Change-Id: I3928e7364f73369f86fbddbb5d23ecdb57c235cd
Etan Cohen [Thu, 8 Feb 2018 07:30:43 +0000 (07:30 +0000)]
[automerger] Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-mr1-dev am:
bd629f69ed am:
1d10387f0d am:
7f4440640b
am:
5c777fbcef
Change-Id: Ib7e482deaac700c58a8cf9fc9514c3890b3e7d9b
Etan Cohen [Thu, 8 Feb 2018 07:09:48 +0000 (07:09 +0000)]
[automerger] Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am:
4feca3b99f am:
b164f1dce0 am:
651db1820d am:
024efb4645 am:
c9e1d843b2
am:
a5802150c4
Change-Id: Ieccbb5238167cb3853f09f647d3ef49cdd02c5f1
Etan Cohen [Thu, 8 Feb 2018 07:09:02 +0000 (07:09 +0000)]
Merge changes from topic "am-
075f69afbbda4610b4adfcdcb0fd78fc" into oc-dev
am:
8e5ec12799
Change-Id: I3eed03bdd6515f32bb419fee9a9f9af9367ab424
Etan Cohen [Thu, 8 Feb 2018 06:46:44 +0000 (06:46 +0000)]
Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into oc-dev am:
4839fb4abd
am:
beef47bfee
Change-Id: I3792100af3d64b1ee520b0403ddfdb5198dee346
Etan Cohen [Thu, 8 Feb 2018 06:34:06 +0000 (06:34 +0000)]
[automerger] Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am:
4feca3b99f am:
b164f1dce0 am:
651db1820d am:
024efb4645
am:
c9e1d843b2
Change-Id: I28ecedebcea9fdac3858626cdac2c0a2bc8925f5
Etan Cohen [Thu, 8 Feb 2018 06:21:54 +0000 (06:21 +0000)]
Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into oc-dev am:
827eb741d7
am:
03c97d0a92
Change-Id: I80025b0036a7d9b5a77e3807bff44ef22aa898d2
Etan Cohen [Thu, 8 Feb 2018 06:13:44 +0000 (06:13 +0000)]
Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into oc-dev
am:
4839fb4abd
Change-Id: I330f9c4e3732d4655e294d6ad2c1ab120ce10b10
Etan Cohen [Thu, 8 Feb 2018 05:57:25 +0000 (05:57 +0000)]
[automerger] Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev am:
eac0551992 am:
196b64c28c am:
af8b7b859a am:
25b8c8b3fb am:
c290ad3333 am:
b26a010054 am:
000e6625c4
am:
7bd058e35e
Change-Id: Ibd656fd5a759fc864868da09e3b63bc2fadf204a
Etan Cohen [Thu, 8 Feb 2018 05:40:11 +0000 (05:40 +0000)]
Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into oc-dev
am:
827eb741d7
Change-Id: Ic35c752cb5435d00eb91df8e296a433e859c3afc
Etan Cohen [Thu, 8 Feb 2018 05:39:35 +0000 (05:39 +0000)]
Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-mr2-dev am:
e12dda4b7c" into oc-dev am:
08833f4f58
am:
f28aa657bc
Change-Id: Ib65b042822db0543d122bcdde18464617b60c6ab
Etan Cohen [Thu, 8 Feb 2018 05:08:37 +0000 (05:08 +0000)]
[automerger] Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev am:
eac0551992 am:
196b64c28c am:
af8b7b859a am:
25b8c8b3fb am:
c290ad3333 am:
b26a010054
am:
000e6625c4
Change-Id: Ic3a04af34c060c3d1e18c95a984cacaeba17f5b5
Etan Cohen [Thu, 8 Feb 2018 04:51:05 +0000 (04:51 +0000)]
Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-mr2-dev am:
e12dda4b7c" into oc-dev
am:
08833f4f58
Change-Id: I5c61df4ec8100ae5c34e319f1ced7ae5f57e1ba7
Etan Cohen [Thu, 8 Feb 2018 04:45:56 +0000 (04:45 +0000)]
Merge changes from topic "am-
dac98ec1428b47c5bf6a45c28771bf33" into oc-dev am:
2ef9262f9a
am:
e7a0ce2afa
Change-Id: I337eff8e14e63e9a615a463e6f6d74d71feed7ff
Etan Cohen [Thu, 8 Feb 2018 04:16:52 +0000 (04:16 +0000)]
Merge changes from topic "am-
dac98ec1428b47c5bf6a45c28771bf33" into oc-dev
am:
2ef9262f9a
Change-Id: I5323f77b9f57eced0ee22e387a989e4532409235
Etan Cohen [Thu, 8 Feb 2018 04:06:02 +0000 (04:06 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-mr1-dev am:
a6d45d9768 am:
c2f948ccc1 am:
4c4cf86e9d am:
7179a3425c
am:
2fe9543fda
Change-Id: I9ac2c6072ecd28550c0da0303f7447480b7d23b6
Etan Cohen [Thu, 8 Feb 2018 03:46:22 +0000 (03:46 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-dev am:
f780227541 am:
f4e8657a0e am:
2d3b87ce06 am:
5558a64435 am:
484e2c4ea1 am:
3938fca8fa
am:
a97fcf83f5
Change-Id: I19e29c96676d5bcf7a20417db76b0ed4501e1f3a
Etan Cohen [Thu, 8 Feb 2018 03:41:19 +0000 (03:41 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-mr1-dev am:
a6d45d9768 am:
c2f948ccc1 am:
4c4cf86e9d
am:
7179a3425c
Change-Id: Id872a1a9d460df227fb13f757516a8b1bae36d25
Etan Cohen [Thu, 8 Feb 2018 03:28:58 +0000 (03:28 +0000)]
Merge changes from topic "am-
922cd235076540bdb5f01e7024397331" into oc-dev am:
889b8f2146
am:
efce54b53d
Change-Id: Ied097bdb1385edc2820b80401097bdd3675ee53f
Etan Cohen [Thu, 8 Feb 2018 03:21:52 +0000 (03:21 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-dev am:
f780227541 am:
f4e8657a0e am:
2d3b87ce06 am:
5558a64435 am:
484e2c4ea1
am:
3938fca8fa
Change-Id: I1b34feca36d03880f8961e409af8961488e38d4c
Etan Cohen [Thu, 8 Feb 2018 03:04:37 +0000 (03:04 +0000)]
Merge changes from topic "am-
922cd235076540bdb5f01e7024397331" into oc-dev
am:
889b8f2146
Change-Id: I449caa98d4e760224c727c79e29920a4ca7e5055
Etan Cohen [Thu, 8 Feb 2018 02:54:37 +0000 (02:54 +0000)]
Merge changes from topic "am-
5525892b4ae143f49ddb25efbc5582ff" into oc-dev am:
36fe919606
am:
c9be10b85f
Change-Id: I35caf3e76e9cf7aab89bf346a8571075e834ad64
Etan Cohen [Thu, 8 Feb 2018 02:29:18 +0000 (02:29 +0000)]
Merge changes from topic "am-
5525892b4ae143f49ddb25efbc5582ff" into oc-dev
am:
36fe919606
Change-Id: I27c7213c4d42a99543825a2f66785df2b97d8f01
Etan Cohen [Thu, 8 Feb 2018 02:19:40 +0000 (02:19 +0000)]
Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into oc-dev am:
320ae6c392
am:
72ec6ee567
Change-Id: Idd143a0e350d035b8f401547bf7809a23c9f0a93
Etan Cohen [Thu, 8 Feb 2018 01:55:04 +0000 (01:55 +0000)]
Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into oc-dev
am:
320ae6c392
Change-Id: Ic16f826b5ea55bd5c5050468b45bef454385b3ac
Android Build Merger (Role) [Thu, 8 Feb 2018 01:07:32 +0000 (01:07 +0000)]
[automerger] Merge "Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am:
50d4e94767" into cw-f-dev am:
9e5c21243c am:
5a590c68df
Change-Id: Iad2f6bbb0783083c5e5a3845843b6ac92b1560d8
Etan Cohen [Thu, 8 Feb 2018 01:06:47 +0000 (01:06 +0000)]
Merge "Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am:
50d4e94767" into cw-f-dev
am:
9e5c21243c
Change-Id: Iff594c5c0a8e258528d6c0a8399a2df057f90633
Etan Cohen [Thu, 8 Feb 2018 00:42:11 +0000 (00:42 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:
e137462b2c am:
15754b34be am:
c3fc912374 am:
0c37ab30a1 am:
def8c23fb5 am:
2367a1a63e am:
ec3b2c4683 am:
bde11f2314 am:
71bb27a3da am:
ff94c32675
am:
1c490515bd
Change-Id: I3581a6741418cfa0b59b48098511d9a295f3023a
Android Build Merger (Role) [Thu, 8 Feb 2018 00:27:17 +0000 (00:27 +0000)]
Merge "Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am:
50d4e94767" into cw-f-dev
Android Build Merger (Role) [Thu, 8 Feb 2018 00:26:40 +0000 (00:26 +0000)]
[automerger] Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am:
50d4e94767 am:
1aab54a3a3 am:
3979121a99
Change-Id: Ie81fae7db0592bbe435f2809aa0d93b58e581e06
Android Build Merger (Role) [Thu, 8 Feb 2018 00:26:34 +0000 (00:26 +0000)]
[automerger] Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am:
50d4e94767 am:
1aab54a3a3
Change-Id: I83429de2ddef2fe856fb40035204791aa66796f8
Etan Cohen [Thu, 8 Feb 2018 00:26:07 +0000 (00:26 +0000)]
Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev
am:
50d4e94767
Change-Id: I05fe6580c2bf6a44f5fadda55fa5b2d944d9be9e
TreeHugger Robot [Thu, 8 Feb 2018 00:18:26 +0000 (00:18 +0000)]
Merge "Handle onBindingDied in notification manager" into oc-mr1-dev
Android Build Merger (Role) [Thu, 8 Feb 2018 00:16:53 +0000 (00:16 +0000)]
[automerger] Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-dev am:
fa72a625cc am:
cdc187ee10 am:
363b273e9a am:
0c8b40873e am:
d2428ebae4
Change-Id: I6463a678c01ec630fb348fa6661beb681078fe4c
Android Build Merger (Role) [Thu, 8 Feb 2018 00:16:48 +0000 (00:16 +0000)]
[automerger] Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-dev am:
fa72a625cc am:
cdc187ee10 am:
363b273e9a am:
0c8b40873e
Change-Id: If54c2a5deeede4eb51b48c18365229928e3db763
Android Build Merger (Role) [Thu, 8 Feb 2018 00:16:33 +0000 (00:16 +0000)]
[automerger] Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-dev am:
fa72a625cc am:
cdc187ee10 am:
363b273e9a
Change-Id: Idafe9ec60693bf6ffaa3aa7833869261a416d4c1
Android Build Merger (Role) [Thu, 8 Feb 2018 00:16:09 +0000 (00:16 +0000)]
[automerger] Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-dev am:
fa72a625cc am:
cdc187ee10
Change-Id: I75f04f568669d0a09e7b492cc2cbcad8bd80389b
Etan Cohen [Thu, 8 Feb 2018 00:15:28 +0000 (00:15 +0000)]
Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-dev
am:
fa72a625cc
Change-Id: I99bcbd911edac1d5089e510b888c665f02dc881c
Android Build Merger (Role) [Thu, 8 Feb 2018 00:15:26 +0000 (00:15 +0000)]
Merge "Merge changes from topic "am-
02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev am:
39e6bc7495" into oc-dev
Etan Cohen [Thu, 8 Feb 2018 00:14:51 +0000 (00:14 +0000)]
Merge changes from topic "am-
02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev
am:
39e6bc7495
Change-Id: I9bce38d411fa55aed455a3de2dba9d16cca4db6d
Etan Cohen [Thu, 8 Feb 2018 00:13:33 +0000 (00:13 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:
e137462b2c am:
15754b34be am:
c3fc912374 am:
0c37ab30a1 am:
def8c23fb5 am:
2367a1a63e am:
ec3b2c4683 am:
bde11f2314 am:
71bb27a3da
am:
ff94c32675
Change-Id: Ieeb0c8b9f7ed9694d4f1bbd8399a80d146eb8eb8
Android Build Merger (Role) [Thu, 8 Feb 2018 00:07:43 +0000 (00:07 +0000)]
[automerger] Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-mr1-dev am:
bd629f69ed am:
1d10387f0d am:
7f4440640b
Change-Id: Ia78647742f44c9dc51d030d984b0dc9332139044
Android Build Merger (Role) [Thu, 8 Feb 2018 00:07:36 +0000 (00:07 +0000)]
[automerger] Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-mr1-dev am:
bd629f69ed am:
1d10387f0d
Change-Id: Iafbde79d1e7d4342b305726fd7b6e58984d98972
Etan Cohen [Thu, 8 Feb 2018 00:07:01 +0000 (00:07 +0000)]
Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-mr1-dev
am:
bd629f69ed
Change-Id: I23b5db36cb5d4d72a23894e75e36ad483ad23338
Etan Cohen [Thu, 8 Feb 2018 00:03:07 +0000 (00:03 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into oc-dev am:
d05a3078fc
am:
0d2044af4b
Change-Id: I7f622c50449e231d3bcf32dc3fee5ba2f14f8da1
Android Build Merger (Role) [Wed, 7 Feb 2018 23:50:21 +0000 (23:50 +0000)]
Merge changes from topic "am-
075f69afbbda4610b4adfcdcb0fd78fc" into oc-dev
* changes:
[automerger] Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-dr1-dev am:
c157934e61" into nyc-mr1-dev am:
f4ea18a058 am:
3ba85c8957 am:
457e8440d7
[automerger] Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-dr1-dev am:
c157934e61" into nyc-mr1-dev am:
f4ea18a058 am:
3ba85c8957
Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-dr1-dev am:
c157934e61" into nyc-mr1-dev am:
f4ea18a058
Android Build Merger (Role) [Wed, 7 Feb 2018 23:50:21 +0000 (23:50 +0000)]
Merge changes from topic "am-
075f69afbbda4610b4adfcdcb0fd78fc" into nyc-mr2-dev
* changes:
[automerger] Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-dr1-dev am:
c157934e61" into nyc-mr1-dev am:
f4ea18a058 am:
3ba85c8957
Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-dr1-dev am:
c157934e61" into nyc-mr1-dev am:
f4ea18a058
Android Build Merger (Role) [Wed, 7 Feb 2018 23:50:21 +0000 (23:50 +0000)]
Merge "Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-dr1-dev am:
c157934e61" into nyc-mr1-dev am:
f4ea18a058" into cw-f-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:49:05 +0000 (23:49 +0000)]
Merge "Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am:
4feca3b99f" into nyc-mr1-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:49:05 +0000 (23:49 +0000)]
Merge changes from topic "am-
02bffa5d2f4a4860b898fa67a751a8f5" into nyc-mr2-dev
* changes:
[automerger] Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am:
4feca3b99f am:
b164f1dce0 am:
651db1820d
[automerger] Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am:
4feca3b99f am:
b164f1dce0
Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am:
4feca3b99f
Android Build Merger (Role) [Wed, 7 Feb 2018 23:49:05 +0000 (23:49 +0000)]
Merge changes from topic "am-
02bffa5d2f4a4860b898fa67a751a8f5" into cw-f-dev
* changes:
[automerger] Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am:
4feca3b99f am:
b164f1dce0
Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am:
4feca3b99f
Android Build Merger (Role) [Wed, 7 Feb 2018 23:48:28 +0000 (23:48 +0000)]
[automerger] Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-dr1-dev am:
c157934e61" into nyc-mr1-dev am:
f4ea18a058 am:
3ba85c8957 am:
457e8440d7
Change-Id: I01f6d3b238bc1da87df6f6d46ae79cd1d679c72a
Android Build Merger (Role) [Wed, 7 Feb 2018 23:48:16 +0000 (23:48 +0000)]
[automerger] Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-dr1-dev am:
c157934e61" into nyc-mr1-dev am:
f4ea18a058 am:
3ba85c8957
Change-Id: I0ec788c5d0429b15f4e5819e157f4374f413c517
Etan Cohen [Wed, 7 Feb 2018 23:47:23 +0000 (23:47 +0000)]
Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-dr1-dev am:
c157934e61" into nyc-mr1-dev
am:
f4ea18a058
Change-Id: I98fb6d1b1d7020d7ed057454754d1f1f6000fec6
OSDN Git Service
