OSDN Git Service
Alan Viverette [Fri, 9 Mar 2018 20:49:36 +0000 (20:49 +0000)]
Merge changes from topic "viewpager_state" into oc-dev am:
77edd5fabe
am:
5811482acf
Change-Id: Ib6213f0f3b6a0247bbe33c0879a3179fb63eb35f
Alan Viverette [Fri, 9 Mar 2018 20:15:45 +0000 (20:15 +0000)]
Merge changes from topic "viewpager_state" into oc-dev
am:
77edd5fabe
Change-Id: Ic624154d57c8b7398d60c470bd285de35f2499af
Eugene Susla [Fri, 9 Mar 2018 20:09:02 +0000 (20:09 +0000)]
Merge changes from topic "recognition_service-mnc-dev" into oc-dev am:
714fb7ae84
am:
7915ba5c9f
Change-Id: Id938e5cd15852144fcce2367c4fac762f8cfc8ba
Eugene Susla [Fri, 9 Mar 2018 19:48:12 +0000 (19:48 +0000)]
Merge changes from topic "recognition_service-mnc-dev" into oc-dev
am:
714fb7ae84
Change-Id: I07cbecada20685467da9b82e101b7591ec285533
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
Rubin Xu [Fri, 9 Mar 2018 15:55:09 +0000 (15:55 +0000)]
Merge changes from topic "am-
af991497-a243-423d-8f58-
f6bc1131a734" into oc-dev am:
6e30a00c96
am:
f45dbc6a69
Change-Id: Ic7d8a8dd5cff126f9995ba9aa3e1158d724e4403
Rubin Xu [Fri, 9 Mar 2018 15:35:36 +0000 (15:35 +0000)]
Merge changes from topic "am-
af991497-a243-423d-8f58-
f6bc1131a734" into oc-dev
am:
6e30a00c96
Change-Id: I70114bdaa8186e7a2bb23e7d4e2c33c5d5b17e60
Rubin Xu [Fri, 9 Mar 2018 15:33:05 +0000 (15:33 +0000)]
Merge "[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids" into oc-dev am:
a9df845321
am:
8dddc5e1f8
Change-Id: I52e47a1dec4e71c4002d2657cc99e712a39f8d34
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
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 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 21:27:20 +0000 (21:27 +0000)]
Merge changes from topic "am-
74e79eb6-59c1-4f9c-a993-
72eeee3859c4" into oc-dev am:
b6b6c01847
am:
bdc573b39b
Change-Id: I42858af9b3a8d5e436ce9bbff0a697290f9803d9
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
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 23:39:11 +0000 (23:39 +0000)]
Merge "Fix mismatch in parcel read/write in ParcelableCasData -- DO NOT MERGE" into oc-dev am:
5d2153d17c
am:
2d0e5b6acc -s ours
Change-Id: I231859f9e26c99ae3a34241842e50f4d44d23f93
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
Scott Main [Wed, 7 Mar 2018 01:39:45 +0000 (01:39 +0000)]
Merge "Fix javadoc typo causing broken links" into oc-mr1-dev
Scott Main [Tue, 6 Mar 2018 22:57:07 +0000 (14:57 -0800)]
Fix javadoc typo causing broken links
Change-Id: I988e06100562c574bbda1bb530359da289062d65
bug:
74262753
TreeHugger Robot [Mon, 5 Mar 2018 21:05:17 +0000 (21:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Mon, 5 Mar 2018 19:01:28 +0000 (19:01 +0000)]
Merge changes from topic "am-
d9c6be77-633d-4f98-8eb7-
b9106af9ba0f" into oc-dev am:
99cc6cb2a1
am:
c3f0a8e200
Change-Id: Ia23c96b2880f13df80c3955c5acb0822bb6f2dd9
Bill Yi [Mon, 5 Mar 2018 18:56:01 +0000 (18:56 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c9f5891a7f skipped:
0a1d5cc852 am:
4532cd3395 -s ours
am:
87addf6d04 -s ours
Change-Id: I0cb81b26368af76cfef8b4104df9ac0722f1ac3f
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 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
Bill Yi [Sat, 3 Mar 2018 12:12:28 +0000 (04:12 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I5a2659669ab0380f04874900b12fa385f5e8b199
TreeHugger Robot [Sat, 3 Mar 2018 12:01:20 +0000 (12:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 3 Mar 2018 08:21:46 +0000 (08:21 +0000)]
Merge changes from topic "am-
6f0d1125-8060-4e8b-afe5-
8e18597ac90b" into oc-dev am:
ee97cf22ba
am:
ceb2e462f8
Change-Id: I1d0313a868fd0083b78994912746f1fbe5acf714
Bill Yi [Sat, 3 Mar 2018 08:15:59 +0000 (08:15 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
dfffd1a532 skipped:
b8f08e00fd am:
4cd38db343 -s ours
am:
d1ed6e90b2 -s ours
Change-Id: I6afd2c8ac6b486398cd0cc9d051d5ebef456bfaa
Bill Yi [Sat, 3 Mar 2018 08:09:41 +0000 (08:09 +0000)]
Merge changes from topic "am-
9b4b0f8c-4823-4712-936a-
f4aafe519eff" into oc-dev am:
13ac18d299
am:
585ba6b3ec
Change-Id: I70d1513b0c85f9a31eafe5cb1785e47ab7e29ed9
Bill Yi [Sat, 3 Mar 2018 08:05:08 +0000 (08:05 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed skipped:
b0046a8e4e am:
dbea58fe4b -s ours
am:
6a223c3aaa -s ours
Change-Id: Idf18f2f7f59f15c12ed1f18c337f6a08913b7f34
Bill Yi [Sat, 3 Mar 2018 07:37:08 +0000 (07:37 +0000)]
Merge changes from topic "am-
2cc1b50f-d7fa-4824-840a-
51adc851b2fa" into oc-dev am:
b59324afa1
am:
bf7981bf90
Change-Id: Ib3e91f95f6bb6cde1c65be0d3cd9a9e3b45b0e7e
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:30:57 +0000 (07:30 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905 skipped:
2a68a8d9ad am:
551e9b00ee -s ours
am:
7d05ce8473 -s ours
Change-Id: I5c502117018ae3a155feaacd0e72ce14c302728b
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:16:45 +0000 (07:16 +0000)]
Merge changes from topic "am-
72eed970-759d-4148-b4df-
72c2aa104b56" into oc-dev am:
3850cf69e3
am:
bad5ea4cb1
Change-Id: I4ab3e06e6a678dfff13d3ab205a497375b711f72
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:11:41 +0000 (07:11 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
73534775a6 skipped:
9c8f34f724 am:
ac782db7b2 -s ours
am:
1f6fdce0b0 -s ours
Change-Id: I890e25939e0ca062b0be8c628089dbe455302fa2
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:48:20 +0000 (06:48 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
52ebdfd973 skipped:
c400b6da60 am:
fa863f597e -s ours
am:
3d82e195f7 -s ours
Change-Id: Ie89698d2c1a3974e4721d9bcc36bc8141c91bd13
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 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 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: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: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: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: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
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
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
Bill Yi [Thu, 1 Mar 2018 19:07:05 +0000 (11:07 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Icaa2d12ea2c5a2d317b59d1799b643887cc23db5
Scott Main [Thu, 1 Mar 2018 19:04:08 +0000 (19:04 +0000)]
Merge "Enable new yaml file for reference nav that lists all framework files." into oc-mr1-dev
Scott Main [Tue, 19 Dec 2017 21:43:45 +0000 (13:43 -0800)]
Enable new yaml file for reference nav that lists all framework files.
This depends on DocLava changes in ag/
3382461
bug: b/
69845924
test: make ds-docs
Change-Id: I4acd2c2034581b349ab4c00cbfe195ee5eca2354
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
OSDN Git Service
