OSDN Git Service
Rubin Xu [Fri, 9 Mar 2018 15:15:07 +0000 (15:15 +0000)]
Merge "[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids" into oc-dev
am:
a9df845321
Change-Id: I0d7f4421d10f977eb9071ba3478da771e58541ca
Rubin Xu [Fri, 9 Mar 2018 14:59:30 +0000 (14:59 +0000)]
Merge "[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids" into oc-dev
Fyodor Kupolov [Thu, 8 Mar 2018 20:54:39 +0000 (20:54 +0000)]
Merge changes from topic "am-
74e79eb6-59c1-4f9c-a993-
72eeee3859c4" into oc-dev
am:
b6b6c01847
Change-Id: I3bd011083894e1db22b90d38d71a0807facd151f
Fyodor Kupolov [Thu, 8 Mar 2018 20:30:06 +0000 (20:30 +0000)]
Merge changes from topic "am-
74e79eb6-59c1-4f9c-a993-
72eeee3859c4" into oc-dev
* changes:
[automerger] Verify last array's length in readFromParcel am:
3b8bc2e450 am:
71478241eb am:
e0b5c2d25e am:
fa32631c63 am:
3a295c1c7f
[automerger] Verify last array's length in readFromParcel am:
3b8bc2e450 am:
71478241eb am:
e0b5c2d25e am:
fa32631c63
[automerger] Verify last array's length in readFromParcel am:
3b8bc2e450 am:
71478241eb am:
e0b5c2d25e
[automerger] Verify last array's length in readFromParcel am:
3b8bc2e450 am:
71478241eb
[automerger] Verify last array's length in readFromParcel am:
3b8bc2e450
Verify last array's length in readFromParcel
Rubin Xu [Thu, 11 Jan 2018 10:59:19 +0000 (10:59 +0000)]
[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids
Bug:
63000005
Test: runtest frameworks-net -c com.android.server.connectivity.VpnTest
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.MixedDeviceOwnerTest#testAlwaysOnVpnLockDown
Merged-In: Ia1a82ee73d8617f3124032986fe6c09c14bf7752
Change-Id: Ia1a82ee73d8617f3124032986fe6c09c14bf7752
Chong Zhang [Wed, 7 Mar 2018 23:17:01 +0000 (23:17 +0000)]
Merge "Fix mismatch in parcel read/write in ParcelableCasData -- DO NOT MERGE" into oc-dev
am:
5d2153d17c
Change-Id: I04e026a96e1899ba9496979561df5680297f546a
Chong Zhang [Wed, 7 Mar 2018 22:59:15 +0000 (22:59 +0000)]
Merge "Fix mismatch in parcel read/write in ParcelableCasData -- DO NOT MERGE" into oc-dev
Bill Yi [Mon, 5 Mar 2018 18:37:15 +0000 (18:37 +0000)]
Merge changes from topic "am-
d9c6be77-633d-4f98-8eb7-
b9106af9ba0f" into oc-dev
am:
99cc6cb2a1
Change-Id: I618380bb159e5f394fabcc9ff69bde6f2d0679d5
Bill Yi [Mon, 5 Mar 2018 18:35:22 +0000 (18:35 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c9f5891a7f skipped:
0a1d5cc852
am:
4532cd3395 -s ours
Change-Id: Ia8e72bfd84aeb59e7138e04f943abd73fd1cceb9
TreeHugger Robot [Mon, 5 Mar 2018 17:57:45 +0000 (17:57 +0000)]
Merge changes from topic "am-
d9c6be77-633d-4f98-8eb7-
b9106af9ba0f" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
c9f5891a7f skipped:
0a1d5cc852
[automerger skipped] Import translations. DO NOT MERGE skipped:
c9f5891a7f
Import translations. DO NOT MERGE
Bill Yi [Sat, 3 Mar 2018 07:31:51 +0000 (07:31 +0000)]
Merge changes from topic "am-
6f0d1125-8060-4e8b-afe5-
8e18597ac90b" into oc-dev
am:
ee97cf22ba
Change-Id: Ia9e780f378a33f48434d1e98760091d3642c8990
Bill Yi [Sat, 3 Mar 2018 07:29:56 +0000 (07:29 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
dfffd1a532 skipped:
b8f08e00fd
am:
4cd38db343 -s ours
Change-Id: I1800067c2cb7ca5de32951338f2548390c396fad
Bill Yi [Sat, 3 Mar 2018 07:17:16 +0000 (07:17 +0000)]
Merge changes from topic "am-
9b4b0f8c-4823-4712-936a-
f4aafe519eff" into oc-dev
am:
13ac18d299
Change-Id: I1e5b02cb9baad310f20bace33ce89c9668fbb3c0
Bill Yi [Sat, 3 Mar 2018 07:15:14 +0000 (07:15 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed skipped:
b0046a8e4e
am:
dbea58fe4b -s ours
Change-Id: Ic72202f29a2a0101edfe89bce777b9a514296ebd
Bill Yi [Sat, 3 Mar 2018 07:03:23 +0000 (07:03 +0000)]
Merge changes from topic "am-
2cc1b50f-d7fa-4824-840a-
51adc851b2fa" into oc-dev
am:
b59324afa1
Change-Id: I34809b7775652fa23e145a73647b67292f41f10e
Bill Yi [Sat, 3 Mar 2018 07:01:41 +0000 (07:01 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905 skipped:
2a68a8d9ad
am:
551e9b00ee -s ours
Change-Id: I482f064fca94761b7d01597177d7642629cf1553
Bill Yi [Sat, 3 Mar 2018 06:51:28 +0000 (06:51 +0000)]
Merge changes from topic "am-
72eed970-759d-4148-b4df-
72c2aa104b56" into oc-dev
am:
3850cf69e3
Change-Id: Ic7be79fc9564f5c3fda0e6874be6eb1f7edbb143
Bill Yi [Sat, 3 Mar 2018 06:49:53 +0000 (06:49 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
73534775a6 skipped:
9c8f34f724
am:
ac782db7b2 -s ours
Change-Id: Ia227614e9fb5abe03c01ff7475f5ce2f7f06ef61
Bill Yi [Sat, 3 Mar 2018 06:37:52 +0000 (06:37 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
52ebdfd973 skipped:
c400b6da60
am:
fa863f597e -s ours
Change-Id: I65d675e10fff69c1b45b8bb07a1acb1bcff17dbd
TreeHugger Robot [Sat, 3 Mar 2018 05:43:12 +0000 (05:43 +0000)]
Merge changes from topic "am-
6f0d1125-8060-4e8b-afe5-
8e18597ac90b" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
dfffd1a532 skipped:
b8f08e00fd
[automerger skipped] Import translations. DO NOT MERGE skipped:
dfffd1a532
Import translations. DO NOT MERGE
TreeHugger Robot [Sat, 3 Mar 2018 05:28:36 +0000 (05:28 +0000)]
Merge changes from topic "am-
9b4b0f8c-4823-4712-936a-
f4aafe519eff" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed skipped:
b0046a8e4e
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed
Import translations. DO NOT MERGE
TreeHugger Robot [Sat, 3 Mar 2018 05:28:03 +0000 (05:28 +0000)]
Merge changes from topic "am-
2cc1b50f-d7fa-4824-840a-
51adc851b2fa" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905 skipped:
2a68a8d9ad
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905
Import translations. DO NOT MERGE
TreeHugger Robot [Sat, 3 Mar 2018 05:27:27 +0000 (05:27 +0000)]
Merge changes from topic "am-
72eed970-759d-4148-b4df-
72c2aa104b56" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
73534775a6 skipped:
9c8f34f724
[automerger skipped] Import translations. DO NOT MERGE skipped:
73534775a6
Import translations. DO NOT MERGE
Android Build Merger (Role) [Sat, 3 Mar 2018 00:44:08 +0000 (00:44 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
52ebdfd973 skipped:
c400b6da60
Change-Id: I634172b202c3401d476668f1173ab8fede42bc0b
Android Build Merger (Role) [Sat, 3 Mar 2018 00:44:01 +0000 (00:44 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
52ebdfd973
Change-Id: If3964293aa4ce9c51ecb353ef8c2ee817d14e460
Bill Yi [Sat, 3 Mar 2018 00:43:41 +0000 (16:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: I741e6b188e72f4805e0eb34d27b93cdf89cfcad0
Auto-generated-cl: translation import
Android Build Merger (Role) [Fri, 2 Mar 2018 23:39:54 +0000 (23:39 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
73534775a6 skipped:
9c8f34f724
Change-Id: Icea7f683d6428ed86d7446071fd85547127ee9dc
Android Build Merger (Role) [Fri, 2 Mar 2018 23:39:48 +0000 (23:39 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
73534775a6
Change-Id: Ic29200b8737f5718d33791faa5f7f12f3eeb9d76
Bill Yi [Fri, 2 Mar 2018 23:39:30 +0000 (15:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: I823f9d64c30c157bd876f95c1f99ffddb0d88a4c
Auto-generated-cl: translation import
Android Build Merger (Role) [Fri, 2 Mar 2018 23:34:03 +0000 (23:34 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed skipped:
b0046a8e4e
Change-Id: I334a5d4006779caa60b3459cf73aca3b086b06e3
Android Build Merger (Role) [Fri, 2 Mar 2018 23:33:58 +0000 (23:33 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed
Change-Id: I2ce2dd84a3c87c575059a2f33f99dd7d6f43bef5
Bill Yi [Fri, 2 Mar 2018 23:33:37 +0000 (15:33 -0800)]
Import translations. DO NOT MERGE
Change-Id: If394c2c84402b8d346f151b66e09337389425e47
Auto-generated-cl: translation import
Android Build Merger (Role) [Fri, 2 Mar 2018 23:02:09 +0000 (23:02 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
dfffd1a532 skipped:
b8f08e00fd
Change-Id: I5115053a7f801215fea81c8f23bbb275aab0e0fd
Android Build Merger (Role) [Fri, 2 Mar 2018 23:02:04 +0000 (23:02 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
dfffd1a532
Change-Id: Id9175caf6dec27c84c1046d0f972ff82d56248a7
Bill Yi [Fri, 2 Mar 2018 23:01:39 +0000 (15:01 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icece121527012851ebbde0a78216acd34f7061aa
Auto-generated-cl: translation import
Android Build Merger (Role) [Fri, 2 Mar 2018 22:40:22 +0000 (22:40 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905 skipped:
2a68a8d9ad
Change-Id: I3eabd9c7e638ba1b860759c07fb27360a91d8ab3
Android Build Merger (Role) [Fri, 2 Mar 2018 22:40:15 +0000 (22:40 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905
Change-Id: I6b298dd7d2c471c2ec860b0760b97fd06a360d81
Bill Yi [Fri, 2 Mar 2018 22:39:55 +0000 (14:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: If21d03f82c2a5eafaec39ecf54f05ed51fdacde6
Auto-generated-cl: translation import
Android Build Merger (Role) [Fri, 2 Mar 2018 22:34:16 +0000 (22:34 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c9f5891a7f skipped:
0a1d5cc852
Change-Id: I17e5d935ea4442a8f14b503536bbfaa30bb5b0e7
Android Build Merger (Role) [Fri, 2 Mar 2018 22:34:09 +0000 (22:34 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c9f5891a7f
Change-Id: Ib96b1dcb7c24fd19e8012847185aceeb966c1c81
Bill Yi [Fri, 2 Mar 2018 22:33:43 +0000 (14:33 -0800)]
Import translations. DO NOT MERGE
Change-Id: I85f7c4a5a3d339acd12260ae4cf7a9f04836d111
Auto-generated-cl: translation import
Chong Zhang [Tue, 13 Feb 2018 19:09:42 +0000 (11:09 -0800)]
Fix mismatch in parcel read/write in ParcelableCasData -- DO NOT MERGE
bug:
73085795
Change-Id: I19a3a4934d5e26a54f8875b8b517b5889c689b96
Android Build Merger (Role) [Wed, 21 Feb 2018 20:27:16 +0000 (20:27 +0000)]
[automerger] Verify last array's length in readFromParcel am:
3b8bc2e450 am:
71478241eb am:
e0b5c2d25e am:
fa32631c63 am:
3a295c1c7f
Change-Id: I720535127956baa76dc6dbad42b9ec92a819916f
Android Build Merger (Role) [Wed, 21 Feb 2018 20:27:11 +0000 (20:27 +0000)]
[automerger] Verify last array's length in readFromParcel am:
3b8bc2e450 am:
71478241eb am:
e0b5c2d25e am:
fa32631c63
Change-Id: I1d42aa3bea943a1564741443fb7db3ec98583fe3
Android Build Merger (Role) [Wed, 21 Feb 2018 20:27:06 +0000 (20:27 +0000)]
[automerger] Verify last array's length in readFromParcel am:
3b8bc2e450 am:
71478241eb am:
e0b5c2d25e
Change-Id: Ib60d63bcc8769f10a64753f7fccf07c103b35c09
Android Build Merger (Role) [Wed, 21 Feb 2018 20:27:01 +0000 (20:27 +0000)]
[automerger] Verify last array's length in readFromParcel am:
3b8bc2e450 am:
71478241eb
Change-Id: I5fb0625286289c43644612528d25fb3f90f6ec7b
Android Build Merger (Role) [Wed, 21 Feb 2018 20:26:56 +0000 (20:26 +0000)]
[automerger] Verify last array's length in readFromParcel am:
3b8bc2e450
Change-Id: If09aad1fa86dbc5c6223d06f67b81d45660ca2d3
Fyodor Kupolov [Wed, 21 Feb 2018 01:02:35 +0000 (17:02 -0800)]
Verify last array's length in readFromParcel
Length of the last array in readFromParcel should be the same as
value of mNextIndex.
Test: PoC app in the bug
Bug:
73252178
Change-Id: I69f935949e945c3a036b19b4f88684d906079ea5
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: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:54:20 +0000 (04:54 +0000)]
Merge changes from topic "am-
b69199ef-52eb-434d-a231-
8cb19da641fc" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
4c87ffeae2
Import translations. DO NOT MERGE
TreeHugger Robot [Tue, 20 Feb 2018 04:54:20 +0000 (04:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
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
TreeHugger Robot [Tue, 20 Feb 2018 04:53:51 +0000 (04:53 +0000)]
Merge changes from topic "am-
8dbc037c-490f-442d-957b-
fea681fe1136" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
fb5d1738dd
Import translations. DO NOT MERGE
TreeHugger Robot [Tue, 20 Feb 2018 04:53:51 +0000 (04:53 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
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
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
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 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: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: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: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: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: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: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: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: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 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: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: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 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
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