OSDN Git Service
Android Build Merger (Role) [Wed, 7 Feb 2018 23:27:41 +0000 (23:27 +0000)]
Merge changes from topic "am-
922cd235076540bdb5f01e7024397331" into oc-dev
* changes:
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-e-dev am:
6cc0b76e85 am:
c8d99435c1 am:
117c674e9e am:
120c7a74e9 am:
a121aae9d6 am:
718f0ccee3 am:
c5654f4be2
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-e-dev am:
6cc0b76e85 am:
c8d99435c1 am:
117c674e9e am:
120c7a74e9 am:
a121aae9d6 am:
718f0ccee3
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-e-dev am:
6cc0b76e85 am:
c8d99435c1 am:
117c674e9e am:
120c7a74e9 am:
a121aae9d6
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-e-dev am:
6cc0b76e85 am:
c8d99435c1 am:
117c674e9e am:
120c7a74e9
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-e-dev am:
6cc0b76e85 am:
c8d99435c1 am:
117c674e9e
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-e-dev am:
6cc0b76e85 am:
c8d99435c1
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-e-dev am:
6cc0b76e85
Android Build Merger (Role) [Wed, 7 Feb 2018 23:27:31 +0000 (23:27 +0000)]
Merge changes from topic "am-
5525892b4ae143f49ddb25efbc5582ff" into oc-dev
* changes:
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr1.5-dev am:
1c198dfc71 am:
dae4e83eaf am:
aef43d6eb2 am:
7bd5507383 am:
7f50792e76 am:
2b90da4234
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr1.5-dev am:
1c198dfc71 am:
dae4e83eaf am:
aef43d6eb2 am:
7bd5507383 am:
7f50792e76
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr1.5-dev am:
1c198dfc71 am:
dae4e83eaf am:
aef43d6eb2 am:
7bd5507383
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr1.5-dev am:
1c198dfc71 am:
dae4e83eaf am:
aef43d6eb2
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr1.5-dev am:
1c198dfc71 am:
dae4e83eaf
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr1.5-dev am:
1c198dfc71
Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:32 +0000 (23:26 +0000)]
Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into oc-dev
* changes:
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad am:
523fed0deb am:
04e84bb0ec am:
0dcedd2073 am:
fe998dfc30 am:
93c80434f2 am:
a40ac0dc8e am:
4608bfbf25
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad am:
523fed0deb am:
04e84bb0ec am:
0dcedd2073 am:
fe998dfc30 am:
93c80434f2 am:
a40ac0dc8e
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad am:
523fed0deb am:
04e84bb0ec am:
0dcedd2073 am:
fe998dfc30 am:
93c80434f2
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad am:
523fed0deb am:
04e84bb0ec am:
0dcedd2073 am:
fe998dfc30
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad am:
523fed0deb am:
04e84bb0ec am:
0dcedd2073
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad am:
523fed0deb am:
04e84bb0ec
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad am:
523fed0deb
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad
Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:23 +0000 (23:26 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-e-dev am:
6cc0b76e85 am:
c8d99435c1 am:
117c674e9e am:
120c7a74e9 am:
a121aae9d6 am:
718f0ccee3 am:
c5654f4be2
Change-Id: Iefde1a459ad11068b567887d2793548434030942
Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:22 +0000 (23:26 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr1.5-dev am:
1c198dfc71 am:
dae4e83eaf am:
aef43d6eb2 am:
7bd5507383 am:
7f50792e76 am:
2b90da4234
Change-Id: I76961c3136b11b18caeb4705cd8ef69f7cf82b6a
Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:19 +0000 (23:26 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-e-dev am:
6cc0b76e85 am:
c8d99435c1 am:
117c674e9e am:
120c7a74e9 am:
a121aae9d6 am:
718f0ccee3
Change-Id: Id470b8ad345cca6aa20a41c5e1742bcd9dd8fc06
Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:17 +0000 (23:26 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr1.5-dev am:
1c198dfc71 am:
dae4e83eaf am:
aef43d6eb2 am:
7bd5507383 am:
7f50792e76
Change-Id: I680e0d1138855fb67a4dd4c5ca5d33424e523dff
Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:13 +0000 (23:26 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-e-dev am:
6cc0b76e85 am:
c8d99435c1 am:
117c674e9e am:
120c7a74e9 am:
a121aae9d6
Change-Id: Ic1166873e5f114e0ca45c336f687f2d42929ae61
Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:12 +0000 (23:26 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr1.5-dev am:
1c198dfc71 am:
dae4e83eaf am:
aef43d6eb2 am:
7bd5507383
Change-Id: I331838e6ec58b5df596779bf72f3b9d613d79be9
Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:07 +0000 (23:26 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-e-dev am:
6cc0b76e85 am:
c8d99435c1 am:
117c674e9e am:
120c7a74e9
Change-Id: Icf4d2c8532e35a7d3f469f76637f7e3049c97626
Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:07 +0000 (23:26 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr1.5-dev am:
1c198dfc71 am:
dae4e83eaf am:
aef43d6eb2
Change-Id: I89aaa744a375f13466bf7bbf41ef1b7bb5dd3395
Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:02 +0000 (23:26 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-e-dev am:
6cc0b76e85 am:
c8d99435c1 am:
117c674e9e
Change-Id: I1fd6fa75b345a810ae53784b5b56004927cc35a9
Android Build Merger (Role) [Wed, 7 Feb 2018 23:25:57 +0000 (23:25 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr1.5-dev am:
1c198dfc71 am:
dae4e83eaf
Change-Id: I42a1eb239f491eb2c52db802b0b7cd8de9807b13
Android Build Merger (Role) [Wed, 7 Feb 2018 23:25:50 +0000 (23:25 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-e-dev am:
6cc0b76e85 am:
c8d99435c1
Change-Id: I694605b85bb5b5d123663c7fe670274cb2e15f36
Etan Cohen [Wed, 7 Feb 2018 23:25:20 +0000 (23:25 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr1.5-dev
am:
1c198dfc71
Change-Id: I26d40e2d2dd918f8dbe7b8b688f2834808c240c2
Etan Cohen [Wed, 7 Feb 2018 23:24:45 +0000 (23:24 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-e-dev
am:
6cc0b76e85
Change-Id: Ic11f51471318d3343024226f3bc282e35f9d6346
Android Build Merger (Role) [Wed, 7 Feb 2018 23:23:40 +0000 (23:23 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad am:
523fed0deb am:
04e84bb0ec am:
0dcedd2073 am:
fe998dfc30 am:
93c80434f2 am:
a40ac0dc8e am:
4608bfbf25
Change-Id: I110821de6c7e2dff931a17a7f8b3c11e7c13a18a
Android Build Merger (Role) [Wed, 7 Feb 2018 23:23:35 +0000 (23:23 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad am:
523fed0deb am:
04e84bb0ec am:
0dcedd2073 am:
fe998dfc30 am:
93c80434f2 am:
a40ac0dc8e
Change-Id: I70e9b520f0c262000718e64f1d2b96410739f0bb
Android Build Merger (Role) [Wed, 7 Feb 2018 23:23:30 +0000 (23:23 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad am:
523fed0deb am:
04e84bb0ec am:
0dcedd2073 am:
fe998dfc30 am:
93c80434f2
Change-Id: I22bed228480d22ac630abe6b52d6e5d42685f51d
Android Build Merger (Role) [Wed, 7 Feb 2018 23:23:24 +0000 (23:23 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad am:
523fed0deb am:
04e84bb0ec am:
0dcedd2073 am:
fe998dfc30
Change-Id: Ie269466813811e45af06597dcd9f765039d4c7cf
Android Build Merger (Role) [Wed, 7 Feb 2018 23:23:18 +0000 (23:23 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad am:
523fed0deb am:
04e84bb0ec am:
0dcedd2073
Change-Id: I20247f18f27d668e38c6dbf6e79ce184d3641298
Android Build Merger (Role) [Wed, 7 Feb 2018 23:23:06 +0000 (23:23 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad am:
523fed0deb am:
04e84bb0ec
Change-Id: I3cb0275cf475b0551dec3b9e4fbc6301756fb15d
Android Build Merger (Role) [Wed, 7 Feb 2018 23:23:01 +0000 (23:23 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad am:
523fed0deb
Change-Id: I4e69906486cfec4c4db7cbb119df1d55aec55675
Etan Cohen [Wed, 7 Feb 2018 23:22:41 +0000 (23:22 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev
am:
0153ac9dad
Change-Id: I2a07841e7cd27f2ba7c30f9b2df5ddf1afcc6ef5
Android Build Merger (Role) [Wed, 7 Feb 2018 23:22:35 +0000 (23:22 +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
Change-Id: Ie42ef0c2866bd9b0da38a674dce45ef25db225e5
Android Build Merger (Role) [Wed, 7 Feb 2018 23:22:30 +0000 (23:22 +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
Change-Id: Ib885bd161e80cbca44c7dba902f16e761a60e4eb
Android Build Merger (Role) [Wed, 7 Feb 2018 23:22:24 +0000 (23:22 +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
Change-Id: I6efeff8c88619977284067b46080f9df54d73fba
Android Build Merger (Role) [Wed, 7 Feb 2018 23:22:19 +0000 (23:22 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:
e137462b2c am:
15754b34be am:
c3fc912374 am:
0c37ab30a1 am:
def8c23fb5 am:
2367a1a63e
Change-Id: I4431d2adcde5e2c1308a48a90a01d9e324b2c5cd
Android Build Merger (Role) [Wed, 7 Feb 2018 23:22:14 +0000 (23:22 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:
e137462b2c am:
15754b34be am:
c3fc912374 am:
0c37ab30a1 am:
def8c23fb5
Change-Id: I8732629d97566fe507b87e333dc2a7ce562c7b38
Android Build Merger (Role) [Wed, 7 Feb 2018 23:21:59 +0000 (23:21 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:
e137462b2c am:
15754b34be am:
c3fc912374 am:
0c37ab30a1
Change-Id: I5d1adb5f7d6d5eb3ba584033453bf4766b5fd300
Android Build Merger (Role) [Wed, 7 Feb 2018 23:21:52 +0000 (23:21 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:
e137462b2c am:
15754b34be am:
c3fc912374
Change-Id: I9a94eac5fa1b832b4334e08676b2be7a032c3efc
Android Build Merger (Role) [Wed, 7 Feb 2018 23:21:42 +0000 (23:21 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:
e137462b2c am:
15754b34be
Change-Id: Idfec393662af2392aba6949d7ffcad720b4d4eb6
Etan Cohen [Wed, 7 Feb 2018 23:21:17 +0000 (23:21 +0000)]
Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev
am:
e137462b2c
Change-Id: I4132c2ccfc0db161c6a89a6c62fb276f0874d39b
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-dev
* changes:
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c
[RTT] ParcelableRttResults parcel code fix
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr1.5-dev
* changes:
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c
[RTT] ParcelableRttResults parcel code fix
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-e-dev
* changes:
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c
[RTT] ParcelableRttResults parcel code fix
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into oc-dev
* changes:
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766 am:
d38155fc59 am:
e016e9c975 am:
839c0ed22d am:
7ae0c44ca4
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766 am:
d38155fc59 am:
e016e9c975 am:
839c0ed22d
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766 am:
d38155fc59 am:
e016e9c975
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766 am:
d38155fc59
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c
[RTT] ParcelableRttResults parcel code fix
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-mr2-dev
* changes:
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766 am:
d38155fc59 am:
e016e9c975 am:
839c0ed22d
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766 am:
d38155fc59 am:
e016e9c975
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766 am:
d38155fc59
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c
[RTT] ParcelableRttResults parcel code fix
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-f-dev
* changes:
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766 am:
d38155fc59 am:
e016e9c975
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766 am:
d38155fc59
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c
[RTT] ParcelableRttResults parcel code fix
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-mr1-dev
* changes:
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766 am:
d38155fc59
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c
[RTT] ParcelableRttResults parcel code fix
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-dr1-dev
* changes:
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c
[RTT] ParcelableRttResults parcel code fix
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev
* changes:
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c
[RTT] ParcelableRttResults parcel code fix
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 08:19:03 +0000 (08:19 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d am:
83cb35453f am:
4405b0ced2 am:
b3012285e2 am:
ab36ba8483 am:
4af59f1c97 am:
f097744926 am:
469065ccb7
Change-Id: I9af74b6a8fd17dbc9c8c1edebc0db81a07d2e8dc
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:57 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d am:
83cb35453f am:
4405b0ced2 am:
b3012285e2 am:
ab36ba8483 am:
4af59f1c97 am:
f097744926
Change-Id: Ic3e36a94f5c7b3cf33b8c7972fc1bd254be9a31c
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:50 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d am:
83cb35453f am:
4405b0ced2 am:
b3012285e2 am:
ab36ba8483 am:
4af59f1c97
Change-Id: Ic3b71eb297425e9ff6d40c542aa67027317dffea
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:44 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d am:
83cb35453f am:
4405b0ced2 am:
b3012285e2 am:
ab36ba8483
Change-Id: Ie3d39f4c402d3385f45aca01059f03ef4025855f
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:37 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d am:
83cb35453f am:
4405b0ced2 am:
b3012285e2
Change-Id: I76a950ed4296cad67230c36ee9edc0b7cc905c60
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:22 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d am:
83cb35453f am:
4405b0ced2
Change-Id: I7c984a83858ee5bb0b84d122dac27e0273f0a177
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:15 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d am:
83cb35453f
Change-Id: Ib6d585953a35d3d00ab51144af7639c851ac3d72
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:09 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d
Change-Id: I060b6306f3f53b4497b6a19d7221aa1938e66f55
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:02 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888
Change-Id: Ib1b60818cddeefe3031cf6c9880f5b790775aa62
Rubin Xu [Wed, 7 Feb 2018 08:10:08 +0000 (08:10 +0000)]
Fix VerifyCredentialResponse parcelling code
There was an asymmetry between parcelling and unparcelling of
VerifyCredentialResponse that could lead to type confusion if
packed with other objects in a Parcel.
Test: none
Bug:
71714464
Change-Id: Icff68879e249422ccca49f2bb7db85c35b4cb353
Android Build Merger (Role) [Fri, 2 Feb 2018 18:16:45 +0000 (18:16 +0000)]
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766 am:
d38155fc59 am:
e016e9c975 am:
839c0ed22d am:
7ae0c44ca4
Change-Id: Iad48f3c561f94741331a22d4dab5b7a1041fdfd5
Android Build Merger (Role) [Fri, 2 Feb 2018 18:16:40 +0000 (18:16 +0000)]
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766 am:
d38155fc59 am:
e016e9c975 am:
839c0ed22d
Change-Id: If80acece5df0e149bf832970cf4ee1ba60877e71
Android Build Merger (Role) [Fri, 2 Feb 2018 18:16:35 +0000 (18:16 +0000)]
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766 am:
d38155fc59 am:
e016e9c975
Change-Id: I57936e6a45df8f40d3d1aa7a72d57ea40e9b5909
Android Build Merger (Role) [Fri, 2 Feb 2018 18:16:30 +0000 (18:16 +0000)]
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766 am:
d38155fc59
Change-Id: I74d9fbe30fd93e43cfa9d5b3d7eae64418163924
Android Build Merger (Role) [Fri, 2 Feb 2018 18:16:25 +0000 (18:16 +0000)]
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766
Change-Id: I15d12616e80cfd1b4d03a76ef1030fa2003a83d2
Android Build Merger (Role) [Fri, 2 Feb 2018 18:16:12 +0000 (18:16 +0000)]
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8
Change-Id: I5a6d8519fc77c96d2df7afc58c1d45af57250e8b
Android Build Merger (Role) [Fri, 2 Feb 2018 18:16:07 +0000 (18:16 +0000)]
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61
Change-Id: I2be402278897c6d97207672f8bfc5af8cbc6dc6d
Android Build Merger (Role) [Fri, 2 Feb 2018 18:16:00 +0000 (18:16 +0000)]
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4
Change-Id: I371f3a2967a5a7a826bca94637a78b7dae7c2cd8
Android Build Merger (Role) [Fri, 2 Feb 2018 18:15:53 +0000 (18:15 +0000)]
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c
Change-Id: I46bbee504ea7a64d39b98a2a8336b3bcf593869a
Etan Cohen [Fri, 2 Feb 2018 16:07:20 +0000 (08:07 -0800)]
[RTT] ParcelableRttResults parcel code fix
ParcelableRttResults was unparceled incorrectly.
Bug:
70398564
Test: exploit provided in bug no longer works
Change-Id: Ifd6de547e9861bbebc399b43d0cc2899a8160813
Shailesh Saini [Thu, 1 Feb 2018 21:20:24 +0000 (21:20 +0000)]
Merge "AdaptiveIconDrawable should not update layer bounds when bound is empty" into oc-dev
Android Build Merger (Role) [Thu, 1 Feb 2018 14:15:00 +0000 (14:15 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e am:
c1cb058249 am:
2c70774e72 am:
3ec9cb8d3a am:
2876452814 am:
af5c532cc8 am:
86948aa610 am:
abab079bf5 am:
ad47a2d85c
Change-Id: If55b895ba0f1e937d09e405d3e6e5e91a218fd78
Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:55 +0000 (14:14 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e am:
c1cb058249 am:
2c70774e72 am:
3ec9cb8d3a am:
2876452814 am:
af5c532cc8 am:
86948aa610 am:
abab079bf5
Change-Id: Id4a9288f60adf16b25e8c908dba5a0b4b80efd03
Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:50 +0000 (14:14 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e am:
c1cb058249 am:
2c70774e72 am:
3ec9cb8d3a am:
2876452814 am:
af5c532cc8 am:
86948aa610
Change-Id: I54351ca2122f59d01ebc36377efca2c22c4a89de
Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:45 +0000 (14:14 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e am:
c1cb058249 am:
2c70774e72 am:
3ec9cb8d3a am:
2876452814 am:
af5c532cc8
Change-Id: I1038ed8069ddb086c8a098d5dccddfee887b8807
Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:40 +0000 (14:14 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e am:
c1cb058249 am:
2c70774e72 am:
3ec9cb8d3a am:
2876452814
Change-Id: I1b8b8bdfd800c6bed1a8c3e69ef9ba81b9fe2bf2
Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:27 +0000 (14:14 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e am:
c1cb058249 am:
2c70774e72 am:
3ec9cb8d3a
Change-Id: I964d1b8a03e24cc51b8c385d2a04c4a6a338aa36
Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:22 +0000 (14:14 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e am:
c1cb058249 am:
2c70774e72
Change-Id: I982742b65d3ae6941b274c147d09ce6f50533c1e
Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:17 +0000 (14:14 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e am:
c1cb058249
Change-Id: I1ea542611301d0c4359021303b05a5e59ee1185b
Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:11 +0000 (14:14 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e
Change-Id: If53ecf0654e883fa43e2f543561f0f7994763698
Adam Vartanian [Thu, 1 Feb 2018 14:13:34 +0000 (14:13 +0000)]
Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev
am:
5ed5d15e66
Change-Id: I7eb106b0db3ab568a7d8845ddd2025d80eeced3c
Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:57 +0000 (14:06 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786 am:
4021c84e85 am:
2e2580e6bd am:
7caae808a8 am:
349d1c1be5 am:
94cd8a69c6
Change-Id: Ibf20bf72eaea7cbf173e52bf8f57d81fd292a194
Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:52 +0000 (14:06 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786 am:
4021c84e85 am:
2e2580e6bd am:
7caae808a8 am:
349d1c1be5
Change-Id: I3cf57dd4a6bf94731b963602b84af31913de743d
Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:46 +0000 (14:06 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786 am:
4021c84e85 am:
2e2580e6bd am:
7caae808a8
Change-Id: I63980272300f26d8ded0154fc3fb4886cb6df17e
Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:40 +0000 (14:06 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786 am:
4021c84e85 am:
2e2580e6bd
Change-Id: I506e5707bb4eb541740909d36679691f0fd8caf9
Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:34 +0000 (14:06 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786 am:
4021c84e85
Change-Id: Ib248b06c7d6a3c90020e43e04554af39918be955
Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:20 +0000 (14:06 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786
Change-Id: I3649d3b8bfa880ac44c88f5f6672b94877345911
Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:15 +0000 (14:06 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f
Change-Id: Ifd6fc978fb4544f7f4c9fe99599d472c10b071ac
Adam Vartanian [Thu, 1 Feb 2018 14:05:44 +0000 (14:05 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev
am:
fea4158eea
Change-Id: Iea20c91a29115634c2241f535c4a0c489605798f
Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into nyc-mr2-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96 am:
54f1b302ab
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into nyc-mr1-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into nyc-dr1-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr1.5-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:42 +0000 (10:02 +0000)]
Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev
Adam Vartanian [Thu, 1 Feb 2018 10:02:42 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into oc-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96 am:
54f1b302ab am:
6b1b3c9bdc
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96 am:
54f1b302ab
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:42 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into cw-f-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:42 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into nyc-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:42 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into cw-e-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Android Build Merger (Role) [Wed, 31 Jan 2018 22:31:31 +0000 (22:31 +0000)]
[automerger] Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into cw-f-dev am:
afb1b1aeb6 am:
753fdb8bb6
Change-Id: I22952487835512925c3a2fe5ca2086f6b5354844
Android Build Merger (Role) [Wed, 31 Jan 2018 22:30:46 +0000 (22:30 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into nyc-mr2-dev
am:
82db4c8b41
Change-Id: I5c35701ddf6633063cad9ca141856b8612f7ad9b
Android Build Merger (Role) [Wed, 31 Jan 2018 22:30:44 +0000 (22:30 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into cw-f-dev
am:
afb1b1aeb6
Change-Id: I4d2f501b942e2a7dd6c2a3415758ce76087f1b78
TreeHugger Robot [Wed, 31 Jan 2018 22:13:40 +0000 (22:13 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into cw-f-dev
* changes:
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e am:
c26b8635b7
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909
Check for null-terminator in ResStringPool::string8At
TreeHugger Robot [Wed, 31 Jan 2018 22:13:40 +0000 (22:13 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into oc-dev
* changes:
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e am:
c26b8635b7 am:
afac0f46d9 am:
5786491706
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e am:
c26b8635b7 am:
afac0f46d9
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e am:
c26b8635b7
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909
Check for null-terminator in ResStringPool::string8At
TreeHugger Robot [Wed, 31 Jan 2018 22:13:40 +0000 (22:13 +0000)]
Merge changes from topic "am-
1ab9514f-fd12-4093-b1cb-
a77e9f0419c9" into nyc-mr2-dev
* changes:
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e am:
c26b8635b7 am:
afac0f46d9
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e am:
c26b8635b7
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149 am:
b7f7f7e14e
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909
Check for null-terminator in ResStringPool::string8At
TreeHugger Robot [Wed, 31 Jan 2018 21:11:32 +0000 (21:11 +0000)]
Merge "OutputConfiguration: Fix missing mIsShared in parcel read" into oc-dev
OSDN Git Service
