OSDN Git Service
Marco Nelissen [Tue, 7 Nov 2017 21:52:02 +0000 (13:52 -0800)]
Rework thumbnail cleanup -- DO NOT MERGE
Bug:
63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Pengquan Meng [Fri, 9 Mar 2018 23:37:01 +0000 (23:37 +0000)]
Merge changes from topic "am-
59911b1f-fa0c-400c-a3f8-
812ac0a8762b" into oc-dev
* changes:
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734 am:
3b356d5111 am:
a61fe8f6c0 am:
3276de21ea am:
bd60a681bf am:
5d5e5ca7cb am:
f64ab1e93d
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734 am:
3b356d5111 am:
a61fe8f6c0 am:
3276de21ea am:
bd60a681bf am:
5d5e5ca7cb
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734 am:
3b356d5111 am:
a61fe8f6c0 am:
3276de21ea am:
bd60a681bf
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734 am:
3b356d5111 am:
a61fe8f6c0 am:
3276de21ea
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734 am:
3b356d5111 am:
a61fe8f6c0
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734 am:
3b356d5111
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728
Fixed Security Vulnerability of DcParamObject
Alan Viverette [Fri, 9 Mar 2018 18:43:02 +0000 (18:43 +0000)]
Merge changes from topic "viewpager_state" into oc-dev
* changes:
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8 am:
bc42f76941 am:
c42091667c am:
aebf5c06df am:
d04ccc6608 am:
b3e984c412
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8 am:
bc42f76941 am:
c42091667c am:
aebf5c06df am:
d04ccc6608
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8 am:
bc42f76941 am:
c42091667c am:
aebf5c06df
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8 am:
bc42f76941 am:
c42091667c
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8 am:
bc42f76941
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1
Update internal ViewPager's SavedState to match Support Library version
Eugene Susla [Fri, 9 Mar 2018 18:42:08 +0000 (18:42 +0000)]
Merge changes from topic "recognition_service-mnc-dev" into oc-dev
* changes:
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7 am:
cf92266ad9 am:
773f021348 am:
bca318e527 am:
122f5e51bf skipped:
36e5764193
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7 am:
cf92266ad9 am:
773f021348 am:
bca318e527 am:
122f5e51bf
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7 am:
cf92266ad9 am:
773f021348 am:
bca318e527
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7 am:
cf92266ad9 am:
773f021348
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7 am:
cf92266ad9
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe
[DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService
TreeHugger Robot [Fri, 9 Mar 2018 15:01:42 +0000 (15:01 +0000)]
Merge changes from topic "am-
af991497-a243-423d-8f58-
f6bc1131a734" into oc-dev
* changes:
[automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am:
41d8bf1fed am:
595f82f99e am:
3aaa23e1e2 am:
4b71619f50 skipped:
d56e2e2cd0
[automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am:
41d8bf1fed am:
595f82f99e am:
3aaa23e1e2 am:
4b71619f50
[automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am:
41d8bf1fed am:
595f82f99e am:
3aaa23e1e2
[automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am:
41d8bf1fed am:
595f82f99e
[automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am:
41d8bf1fed
[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids
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
Android Build Merger (Role) [Fri, 9 Mar 2018 04:19:32 +0000 (04:19 +0000)]
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734 am:
3b356d5111 am:
a61fe8f6c0 am:
3276de21ea am:
bd60a681bf am:
5d5e5ca7cb am:
f64ab1e93d
Change-Id: I8fc1082b7c6c64cf105246fe374260f72e83a7a8
Android Build Merger (Role) [Fri, 9 Mar 2018 04:19:26 +0000 (04:19 +0000)]
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734 am:
3b356d5111 am:
a61fe8f6c0 am:
3276de21ea am:
bd60a681bf am:
5d5e5ca7cb
Change-Id: I3bd9d6f3d290ae125d57a4650b41b8ff6cbb5591
Android Build Merger (Role) [Fri, 9 Mar 2018 04:19:21 +0000 (04:19 +0000)]
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734 am:
3b356d5111 am:
a61fe8f6c0 am:
3276de21ea am:
bd60a681bf
Change-Id: I8ad286f9218753d76d031f20e4f924de82abc5a1
Android Build Merger (Role) [Fri, 9 Mar 2018 04:19:16 +0000 (04:19 +0000)]
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734 am:
3b356d5111 am:
a61fe8f6c0 am:
3276de21ea
Change-Id: Ic702e9da64dc5aa8e66db22d72f070140c40bdf6
Android Build Merger (Role) [Fri, 9 Mar 2018 04:19:11 +0000 (04:19 +0000)]
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734 am:
3b356d5111 am:
a61fe8f6c0
Change-Id: I9206a21355732e408430ceae77d3095793a04072
Android Build Merger (Role) [Fri, 9 Mar 2018 04:19:00 +0000 (04:19 +0000)]
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734 am:
3b356d5111
Change-Id: I96567f3adabce5207b07f71ac3b8fe60944a83f2
Android Build Merger (Role) [Fri, 9 Mar 2018 04:18:55 +0000 (04:18 +0000)]
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734
Change-Id: I03d75f7b837fdeafabcf64a8d56e1b1f7af89050
Android Build Merger (Role) [Fri, 9 Mar 2018 04:18:50 +0000 (04:18 +0000)]
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb
Change-Id: Ibdad47ba4b4f48341957f1112cf26794ef3af0ac
Android Build Merger (Role) [Fri, 9 Mar 2018 04:18:45 +0000 (04:18 +0000)]
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728
Change-Id: Ic9cf5392057bfb47945e9a1b06abb19697468610
Pengquan Meng [Fri, 9 Mar 2018 04:08:25 +0000 (20:08 -0800)]
Fixed Security Vulnerability of DcParamObject
The writeToParcel and readFromParcel is not symmetry, fixed it.
Test: no test
Bug:
70721937
Change-Id: I01f6f6b2ab778ee8b638d9b69fe0a6b9aa7ee395
Android Build Merger (Role) [Fri, 9 Mar 2018 00:36:28 +0000 (00:36 +0000)]
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7 am:
cf92266ad9 am:
773f021348 am:
bca318e527 am:
122f5e51bf skipped:
36e5764193
Change-Id: I0ec832c5bd859604acbdf0a1a273d5062ca49c7c
Android Build Merger (Role) [Fri, 9 Mar 2018 00:36:23 +0000 (00:36 +0000)]
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7 am:
cf92266ad9 am:
773f021348 am:
bca318e527 am:
122f5e51bf
Change-Id: I2038933c4a044b3746d131027368f3b59d63065b
Android Build Merger (Role) [Fri, 9 Mar 2018 00:36:18 +0000 (00:36 +0000)]
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7 am:
cf92266ad9 am:
773f021348 am:
bca318e527
Change-Id: I9bf4052c140ca9fc068f8d18b9a92015de9e9f90
Android Build Merger (Role) [Fri, 9 Mar 2018 00:36:13 +0000 (00:36 +0000)]
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7 am:
cf92266ad9 am:
773f021348
Change-Id: Idde6da0725fe743bb943b0d712782add546d1506
Android Build Merger (Role) [Fri, 9 Mar 2018 00:36:09 +0000 (00:36 +0000)]
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7 am:
cf92266ad9
Change-Id: Id603e54b576e7c5ae6566f5560bd4599b653bf12
Android Build Merger (Role) [Fri, 9 Mar 2018 00:35:58 +0000 (00:35 +0000)]
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7
Change-Id: I0deb776ab86a2dfa512b092072d9e8f1e4d1b900
Android Build Merger (Role) [Fri, 9 Mar 2018 00:35:53 +0000 (00:35 +0000)]
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5
Change-Id: Icf7b82e7dfbdebeb382c56e2c1db061abd87a3e9
Android Build Merger (Role) [Fri, 9 Mar 2018 00:35:48 +0000 (00:35 +0000)]
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082
Change-Id: I0cbca14aed609ab81556ee1deb72ef1e0e294256
Android Build Merger (Role) [Fri, 9 Mar 2018 00:35:42 +0000 (00:35 +0000)]
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe
Change-Id: I09ac593ade4e725b560384042304f93f451b5be5
Eugene Susla [Thu, 22 Feb 2018 18:39:34 +0000 (10:39 -0800)]
[DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService
Fixes:
73511076,
73311729
Test: presubmit
Change-Id: Ie98f67ffee4744050ac85d8b229370a16a76a194
(cherry picked from commit
726b51a26e9a54b7352aad90ed15edccc44dd60d)
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
Fyodor Kupolov [Thu, 8 Mar 2018 20:30:06 +0000 (20:30 +0000)]
Merge changes from topic "am-
74e79eb6-59c1-4f9c-a993-
72eeee3859c4" into nyc-mr2-dev
* changes:
[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
Fyodor Kupolov [Thu, 8 Mar 2018 20:30:06 +0000 (20:30 +0000)]
Merge changes from topic "am-
74e79eb6-59c1-4f9c-a993-
72eeee3859c4" into cw-f-dev
* changes:
[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 22:59:15 +0000 (22:59 +0000)]
Merge "Fix mismatch in parcel read/write in ParcelableCasData -- DO NOT MERGE" into oc-dev
TreeHugger Robot [Mon, 5 Mar 2018 17:57:45 +0000 (17:57 +0000)]
Merge changes from topic "am-
d9c6be77-633d-4f98-8eb7-
b9106af9ba0f" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
c9f5891a7f
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 5 Mar 2018 17:57:45 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
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
TreeHugger Robot [Sat, 3 Mar 2018 05:43:12 +0000 (05:43 +0000)]
Merge changes from topic "am-
6f0d1125-8060-4e8b-afe5-
8e18597ac90b" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
dfffd1a532
Import translations. DO NOT MERGE
TreeHugger Robot [Sat, 3 Mar 2018 05:43:12 +0000 (05:43 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
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 nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed
Import translations. DO NOT MERGE
TreeHugger Robot [Sat, 3 Mar 2018 05:28:36 +0000 (05:28 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
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 nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905
Import translations. DO NOT MERGE
TreeHugger Robot [Sat, 3 Mar 2018 05:28:03 +0000 (05:28 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
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 nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
73534775a6
Import translations. DO NOT MERGE
TreeHugger Robot [Sat, 3 Mar 2018 05:27:27 +0000 (05:27 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
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
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
Android Build Merger (Role) [Fri, 16 Feb 2018 19:46:21 +0000 (19:46 +0000)]
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8 am:
bc42f76941 am:
c42091667c am:
aebf5c06df am:
d04ccc6608 am:
b3e984c412
Change-Id: I5217e675455809ee18c9a0b06bb3b740d01c09f8
Android Build Merger (Role) [Fri, 16 Feb 2018 19:46:15 +0000 (19:46 +0000)]
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8 am:
bc42f76941 am:
c42091667c am:
aebf5c06df am:
d04ccc6608
Change-Id: I65d895c9ea8506227ad5ba7c77d44827b0cd80fe
Android Build Merger (Role) [Fri, 16 Feb 2018 19:46:09 +0000 (19:46 +0000)]
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8 am:
bc42f76941 am:
c42091667c am:
aebf5c06df
Change-Id: Iedd1e0502ac237920b24cac81a2540cfcf4c8d87
Android Build Merger (Role) [Fri, 16 Feb 2018 19:46:03 +0000 (19:46 +0000)]
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8 am:
bc42f76941 am:
c42091667c
Change-Id: Ia150bf95186b1a7acdec0d723d44f33040951f56
Android Build Merger (Role) [Fri, 16 Feb 2018 19:45:57 +0000 (19:45 +0000)]
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8 am:
bc42f76941
Change-Id: Id69b35c6cc53b6cea1666d724813ae21634c0b4c
Android Build Merger (Role) [Fri, 16 Feb 2018 19:45:41 +0000 (19:45 +0000)]
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8
Change-Id: Ie379f04b1e570ebc94a9e5c37ab3ddbf469acb93
Android Build Merger (Role) [Fri, 16 Feb 2018 19:45:36 +0000 (19:45 +0000)]
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0
Change-Id: Ie54af74e2ab273be07c4cd73881010ee952997ef
Android Build Merger (Role) [Fri, 16 Feb 2018 19:45:30 +0000 (19:45 +0000)]
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831
Change-Id: I33e06bfcad6941fd8845f443991dfbcbd4167348
Android Build Merger (Role) [Fri, 16 Feb 2018 19:45:24 +0000 (19:45 +0000)]
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1
Change-Id: Ia2d011a3e2c705e82ab11dbf571f6f52cf05bae8
Alan Viverette [Fri, 16 Feb 2018 18:56:02 +0000 (13:56 -0500)]
Update internal ViewPager's SavedState to match Support Library version
Merged-In: Ic4569b21d8a26a62bba91742b442f0c3ea8bcc9e
Change-Id: I17d085be9ce1a139e75264f1e715df7f565cd41b
Fixes:
71992105
Test: manual
Siyamed Sinir [Thu, 15 Feb 2018 00:14:36 +0000 (00:14 +0000)]
Merge "DO NOT MERGE Fix mTrustManager NPE" into mnc-dev
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