git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

Marco Nelissen [Mon, 12 Mar 2018 22:09:28 +0000 (22:09 +0000)]

[automerger] Rework thumbnail cleanup am: 82a2a87474 am: 97eb9d056a skipped: cb9dd5d0e6 am: ddfcb07714 -s ours
am: 7e7681f7c3 -s ours

Change-Id: Ic1dc057f8e32e2ef4ab09892f1d46a9f2bf89186

commit | commitdiff | tree

Marco Nelissen [Mon, 12 Mar 2018 21:58:49 +0000 (21:58 +0000)]

[automerger] Rework thumbnail cleanup am: 82a2a87474 am: 97eb9d056a skipped: cb9dd5d0e6
am: ddfcb07714 -s ours

Change-Id: I9f21bbc8a7e4feac60a233fb7c79c587b0bc1a82

commit | commitdiff | tree

Marco Nelissen [Mon, 12 Mar 2018 20:30:31 +0000 (20:30 +0000)]

Rework thumbnail cleanup -- DO NOT MERGE am: 338438b389
am: dfd8732488 -s ours

Change-Id: I55fc68fb627fa472cb7609c0d66e5679c03203fd

commit | commitdiff | tree

Marco Nelissen [Mon, 12 Mar 2018 20:18:40 +0000 (20:18 +0000)]

Rework thumbnail cleanup -- DO NOT MERGE
am: 338438b389

Change-Id: Ie70f916db23cfed4138812cc10a0c708ef1d45a4

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 12 Mar 2018 19:54:22 +0000 (19:54 +0000)]

[automerger] Rework thumbnail cleanup am: 82a2a87474 am: 97eb9d056a skipped: cb9dd5d0e6

Change-Id: Id9b936c4829603ea09fcc631a56755805ffc2b83

commit | commitdiff | tree

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

commit | commitdiff | tree

Pengquan Meng [Sat, 10 Mar 2018 00:44:41 +0000 (00:44 +0000)]

Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into oc-dev am: fe6a5c4675
am: 5eb85f01d2

Change-Id: Iaf8ea26f3739a5c62ce6bb402ae8161ef99b5f80

commit | commitdiff | tree

Pengquan Meng [Sat, 10 Mar 2018 00:20:21 +0000 (00:20 +0000)]

Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into oc-dev
am: fe6a5c4675

Change-Id: I4440e9b50e975ea3a20ecd216b83deb83afe2780

commit | commitdiff | tree

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

commit | commitdiff | tree

Marco Nelissen [Fri, 9 Mar 2018 21:26:07 +0000 (21:26 +0000)]

Merge "Rework thumbnail cleanup" into oc-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Mar 2018 20:33:52 +0000 (20:33 +0000)]

[automerger] Rework thumbnail cleanup am: 82a2a87474 am: 97eb9d056a

Change-Id: Id58fd0db50cf10dd0af21464259e7a6e366edecd

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Mar 2018 20:33:45 +0000 (20:33 +0000)]

[automerger] Rework thumbnail cleanup am: 82a2a87474

Change-Id: Ifbeecd9b3406da6151067987709776adeb807c1f

commit | commitdiff | tree

Marco Nelissen [Tue, 7 Nov 2017 21:52:02 +0000 (13:52 -0800)]

Rework thumbnail cleanup

Bug: 63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Alan Viverette [Fri, 9 Mar 2018 18:43:02 +0000 (18:43 +0000)]

Merge changes from topic "viewpager_state" into nyc-mr2-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
  [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

commit | commitdiff | tree

Alan Viverette [Fri, 9 Mar 2018 18:43:02 +0000 (18:43 +0000)]

Merge changes from topic "viewpager_state" into cw-f-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
  [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

commit | commitdiff | tree

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

commit | commitdiff | tree

Eugene Susla [Fri, 9 Mar 2018 18:42:08 +0000 (18:42 +0000)]

Merge changes from topic "recognition_service-mnc-dev" into nyc-mr2-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
  [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

commit | commitdiff | tree

Eugene Susla [Fri, 9 Mar 2018 18:42:08 +0000 (18:42 +0000)]

Merge changes from topic "recognition_service-mnc-dev" into cw-f-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
  [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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 9 Mar 2018 15:01:42 +0000 (15:01 +0000)]

Merge changes from topic "am-af991497-a243-423d-8f58-f6bc1131a734" into nyc-mr2-dev

* changes:
  [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

commit | commitdiff | tree

TreeHugger Robot [Fri, 9 Mar 2018 15:01:42 +0000 (15:01 +0000)]

Merge changes from topic "am-af991497-a243-423d-8f58-f6bc1131a734" into cw-f-dev

* changes:
  [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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

Marco Nelissen [Tue, 7 Nov 2017 21:52:02 +0000 (13:52 -0800)]

Rework thumbnail cleanup

Bug: 63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Scott Main [Wed, 7 Mar 2018 01:39:45 +0000 (01:39 +0000)]

Merge "Fix javadoc typo causing broken links" into oc-mr1-dev

commit | commitdiff | tree

Scott Main [Tue, 6 Mar 2018 22:57:07 +0000 (14:57 -0800)]

Fix javadoc typo causing broken links

Change-Id: I988e06100562c574bbda1bb530359da289062d65

bug: 74262753

commit | commitdiff | tree

TreeHugger Robot [Mon, 5 Mar 2018 21:05:17 +0000 (21:05 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 5 Mar 2018 17:57:45 +0000 (17:57 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Mar 2018 12:01:20 +0000 (12:01 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Mar 2018 05:43:12 +0000 (05:43 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Mar 2018 05:28:36 +0000 (05:28 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Mar 2018 05:28:03 +0000 (05:28 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help