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

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

Bill Yi [Mon, 30 Jul 2018 05:10:47 +0000 (22:10 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 4c781e19f5 skipped: b3e44fae1f
am: 843fb76d1f -s ours

Change-Id: Id1336208575063e2fe1231b7655731132beb7953

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 29 Jul 2018 15:53:30 +0000 (15:53 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 4c781e19f5 skipped: b3e44fae1f

Change-Id: I877e44ea6efe845c0c30a3280b512c1253d727ce

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 29 Jul 2018 15:53:26 +0000 (15:53 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 4c781e19f5

Change-Id: Ib62c14bc0bb4d205821e8f3b6312c5dca7773fde

commit | commitdiff | tree

Bill Yi [Sun, 29 Jul 2018 15:53:11 +0000 (08:53 -0700)]

Import translations. DO NOT MERGE

Change-Id: I556f15b9dc9c144d1ddd3bee21f823a52afdfbf4
Auto-generated-cl: translation import

commit | commitdiff | tree

Robert Shih [Mon, 16 Jul 2018 19:51:28 +0000 (12:51 -0700)]

Merge changes from topic "am-9e4fa925-b00a-40e6-8fb0-e5a4244e6284" into oc-dev
am: e43837e258

Change-Id: Ib0ef741f0188ff3e6edc52e20eae997e9dba56e4

commit | commitdiff | tree

TreeHugger Robot [Mon, 16 Jul 2018 19:25:14 +0000 (19:25 +0000)]

Merge changes from topic "am-9e4fa925-b00a-40e6-8fb0-e5a4244e6284" into oc-dev

* changes:
  [automerger] Fix TrackInfo parcel write am: 0d2dc943dc am: 00b57fc9b7 am: 1bce1217ca am: 47c831e675 am: d6143e9307
  [automerger] Fix TrackInfo parcel write am: 0d2dc943dc am: 00b57fc9b7 am: 1bce1217ca am: 47c831e675
  [automerger] Fix TrackInfo parcel write am: 0d2dc943dc am: 00b57fc9b7 am: 1bce1217ca
  [automerger] Fix TrackInfo parcel write am: 0d2dc943dc am: 00b57fc9b7
  [automerger] Fix TrackInfo parcel write am: 0d2dc943dc
  Fix TrackInfo parcel write

commit | commitdiff | tree

Bernie Innocenti [Fri, 13 Jul 2018 16:17:40 +0000 (09:17 -0700)]

Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-dev
am: 8f1c70e49b

Change-Id: Ic103dfa909ca4567a815b16f0794baf74c1cf068

commit | commitdiff | tree

TreeHugger Robot [Fri, 13 Jul 2018 16:05:32 +0000 (16:05 +0000)]

Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 13 Jul 2018 06:57:21 +0000 (06:57 +0000)]

[automerger] Fix TrackInfo parcel write am: 0d2dc943dc am: 00b57fc9b7 am: 1bce1217ca am: 47c831e675 am: d6143e9307

Change-Id: I67d3d47cf3ba616d8b8d963d7092895621f63200

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 13 Jul 2018 06:57:15 +0000 (06:57 +0000)]

[automerger] Fix TrackInfo parcel write am: 0d2dc943dc am: 00b57fc9b7 am: 1bce1217ca am: 47c831e675

Change-Id: I1f39ec37a6e4fa163caf51702e0924cc9c89ee04

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 13 Jul 2018 06:57:08 +0000 (06:57 +0000)]

[automerger] Fix TrackInfo parcel write am: 0d2dc943dc am: 00b57fc9b7 am: 1bce1217ca

Change-Id: I29f00c9b6dca76c5b780d659d122e08a0d7e581c

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 13 Jul 2018 06:57:02 +0000 (06:57 +0000)]

[automerger] Fix TrackInfo parcel write am: 0d2dc943dc am: 00b57fc9b7

Change-Id: Ida72e9fed175aa9497af5c5f607640c07cb04cf5

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 13 Jul 2018 06:56:56 +0000 (06:56 +0000)]

[automerger] Fix TrackInfo parcel write am: 0d2dc943dc

Change-Id: I7ea941c8cffa147d2c6a46f0428899bf001a2672

commit | commitdiff | tree

Robert Shih [Mon, 9 Jul 2018 20:38:31 +0000 (13:38 -0700)]

Fix TrackInfo parcel write

Bug: 77600398
Change-Id: Ia316f1c5dc4879f6851fdb78fe8b9039579be7bc

commit | commitdiff | tree

Bill Yi [Thu, 12 Jul 2018 19:47:58 +0000 (12:47 -0700)]

Merge changes from topic "am-9f47cb6c-9cea-4b25-9f9b-e0e460e471ac" into oc-dev
am: 71bd839856

Change-Id: Ic7c05906f4d2f9fecc9ab93ab90b9869d8b176be

commit | commitdiff | tree

Bill Yi [Thu, 12 Jul 2018 19:45:19 +0000 (12:45 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f4037fb69e skipped: 741c97faa9
am: 0c31d81cd1 -s ours

Change-Id: I404ba441a96f77be638d89c0c43f950200a94376

commit | commitdiff | tree

Bill Yi [Thu, 12 Jul 2018 19:41:11 +0000 (12:41 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: e059d5fb83 skipped: e97378c657
am: 9935787f3b -s ours

Change-Id: I1ef782ee8a7ed8da6baed44c052f1fa3a08c1af4

commit | commitdiff | tree

TreeHugger Robot [Thu, 12 Jul 2018 19:26:31 +0000 (19:26 +0000)]

Merge changes from topic "am-9f47cb6c-9cea-4b25-9f9b-e0e460e471ac" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: f4037fb69e skipped: 741c97faa9
  [automerger skipped] Import translations. DO NOT MERGE skipped: f4037fb69e
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Thu, 12 Jul 2018 19:26:31 +0000 (19:26 +0000)]

Merge changes from topic "am-9f47cb6c-9cea-4b25-9f9b-e0e460e471ac" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: f4037fb69e
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Thu, 12 Jul 2018 19:26:31 +0000 (19:26 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 12 Jul 2018 19:18:55 +0000 (19:18 +0000)]

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 12 Jul 2018 01:50:59 +0000 (01:50 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: e059d5fb83 skipped: e97378c657

Change-Id: I444e7a4567e0319e0a1999ca1a83418b14812d5d

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 12 Jul 2018 01:50:52 +0000 (01:50 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: e059d5fb83

Change-Id: I119e6fba2ffa56ca9a8b24df821025abf4bf9580

commit | commitdiff | tree

Bill Yi [Thu, 12 Jul 2018 01:50:30 +0000 (18:50 -0700)]

Import translations. DO NOT MERGE

Change-Id: I989a9b371c1dc0c713b67c0a8cef4f3bdc0c457c
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 11 Jul 2018 23:43:09 +0000 (23:43 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f4037fb69e skipped: 741c97faa9

Change-Id: Ib3e6c7f2885ac23d45a68e7e20d981969067eb3b

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 11 Jul 2018 23:43:02 +0000 (23:43 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f4037fb69e

Change-Id: I37e47c3e87c8e9143731af2b4bf0d92fc4ce7f38

commit | commitdiff | tree

Bill Yi [Wed, 11 Jul 2018 23:42:32 +0000 (16:42 -0700)]

Import translations. DO NOT MERGE

Change-Id: I9878d930e5aa4e4fe1883f28063e167240bb99b5
Auto-generated-cl: translation import

commit | commitdiff | tree

Arthur Ishiguro [Wed, 11 Jul 2018 21:13:30 +0000 (14:13 -0700)]

[automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am: 2895b320b4 am: 77e6e34644 am: 49e97ea1dc am: c2cfe453f2
am: cab2fa779e

Change-Id: Ifdd69396d202951f8b9ed5fe6e5766133955a5e5

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 6 Jul 2018 22:55:21 +0000 (22:55 +0000)]

[automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am: 2895b320b4 am: 77e6e34644 am: 49e97ea1dc am: c2cfe453f2

Change-Id: I6e3461125290f2835ff1f9a996beb92e64172386

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 6 Jul 2018 22:55:14 +0000 (22:55 +0000)]

[automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am: 2895b320b4 am: 77e6e34644 am: 49e97ea1dc

Change-Id: I19c512999a0eae233e2cc7c4d31d0c62556e4ffd

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 6 Jul 2018 22:55:07 +0000 (22:55 +0000)]

[automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am: 2895b320b4 am: 77e6e34644

Change-Id: I87ad6c5bad9275df8b1a131b3ac0daf7ec8ed5e4

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 6 Jul 2018 22:55:02 +0000 (22:55 +0000)]

[automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am: 2895b320b4

Change-Id: I26b97af90ef6ea8b640ff7198b2883297d4fb03e

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 6 Jul 2018 22:54:55 +0000 (22:54 +0000)]

[automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a

Change-Id: Ieb925f073b80e4d624552e738d49b0996f0485ae

commit | commitdiff | tree

Arthur Ishiguro [Mon, 25 Jun 2018 18:31:33 +0000 (11:31 -0700)]

Resolve inconsistent parcel read in NanoAppFilter

Bug: 77599679
Test: Compile only
Change-Id: Ib417a5cb4d51744442d2fb14437cabbe5fd1c266

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 04:18:08 +0000 (21:18 -0700)]

Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev
am: cec93100ea

Change-Id: If8c2cd293875724b99a5177c7235ffbeb64c396e

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 04:15:54 +0000 (21:15 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720
am: c6d9bee144 -s ours

Change-Id: If1145747718e78a0ad5f60015aa0398e1813c078

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 04:11:19 +0000 (21:11 -0700)]

Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev
am: 72e16b1754

Change-Id: I75a0f507a546413eeee64870ba94be647ee5de11

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 04:08:51 +0000 (21:08 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168
am: a05627322f -s ours

Change-Id: I8b0805714082f83552ebb6cbd8290bcd0c39d6cd

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 03:58:16 +0000 (20:58 -0700)]

Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev
am: 6005492cb2

Change-Id: I71789a270fc86b5fc9c74c0de2cd122f1ac26c5e

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 03:56:04 +0000 (20:56 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56
am: 8700285134 -s ours

Change-Id: Ice563d38360e1be62c5f6b869dc69f1ce5dfff24

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 03:51:41 +0000 (20:51 -0700)]

Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev
am: 37d9749e81

Change-Id: I6258da69f13a1ea21b50d0756315619ef190a526

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 03:49:13 +0000 (20:49 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6
am: eacf5ffefb -s ours

Change-Id: I034e3f1a5916c01dc643cde92bd6f42187b5c480

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 03:44:43 +0000 (20:44 -0700)]

Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev
am: c1dc805861

Change-Id: I3a40076fd344300ac6dd812ea2c96012f88e36b0

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 03:42:12 +0000 (20:42 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1
am: 998f40e6c5 -s ours

Change-Id: Ifdbc60e6748887feedc47eb60843d231dae46146

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 03:03:49 +0000 (20:03 -0700)]

Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev
am: ec4d649d8f

Change-Id: I874acb53e25065d4a9a8018f2f0e69d6d041fa8b

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 03:01:40 +0000 (20:01 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc
am: 9204ce40e4 -s ours

Change-Id: Ic798dfd5e7b85f7341d2c929519aa227a95e6f18

commit | commitdiff | tree

Bill Yi [Fri, 6 Jul 2018 02:57:42 +0000 (19:57 -0700)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab
am: b3bf111bd5 -s ours

Change-Id: Ice5c1a283c59a8640868cdc3a8acc4afb97e5468

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:55:05 +0000 (02:55 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:55:05 +0000 (02:55 +0000)]

Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720
  [automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:55:05 +0000 (02:55 +0000)]

Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:50:29 +0000 (02:50 +0000)]

Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168
  [automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:50:29 +0000 (02:50 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:50:29 +0000 (02:50 +0000)]

Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:46:51 +0000 (02:46 +0000)]

Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56
  [automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:46:51 +0000 (02:46 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:46:51 +0000 (02:46 +0000)]

Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:46:29 +0000 (02:46 +0000)]

Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6
  [automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:46:29 +0000 (02:46 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:46:29 +0000 (02:46 +0000)]

Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:45:57 +0000 (02:45 +0000)]

Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1
  [automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:45:57 +0000 (02:45 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:45:57 +0000 (02:45 +0000)]

Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:45:27 +0000 (02:45 +0000)]

Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc
  [automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:45:27 +0000 (02:45 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:45:27 +0000 (02:45 +0000)]

Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6
Import translations. DO NOT MERGE

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 22:39:37 +0000 (22:39 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168

Change-Id: I2850da8ee89c8ed1dcfc7fc443eb8a2dcb6346bd

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 22:39:28 +0000 (22:39 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae

Change-Id: I66b3bb58351d966fbe38e7448c985206e73af9d5

commit | commitdiff | tree

Bill Yi [Thu, 5 Jul 2018 22:38:55 +0000 (15:38 -0700)]

Import translations. DO NOT MERGE

Change-Id: I3ce8cc748d098e3854a7c2b19cdc0d0fe4281288
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 21:45:40 +0000 (21:45 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc

Change-Id: I5c0a1faf8d1dc7bf5d6fc831b61ab40697a422d5

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 21:45:32 +0000 (21:45 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6

Change-Id: I8ba42b65a49ff3e9c30e56dc8664bc8a942b4d25

commit | commitdiff | tree

Bill Yi [Thu, 5 Jul 2018 21:45:03 +0000 (14:45 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ib37886b826a61cf234e745494df8f57f58aafda6
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 21:38:44 +0000 (21:38 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1

Change-Id: I99aab27eecf8e8d5d092cabc316b0d3b68a97b2c

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 21:38:36 +0000 (21:38 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec

Change-Id: I09e334aa2acf3c0d32b27b9d18193450db041c6a

commit | commitdiff | tree

Bill Yi [Thu, 5 Jul 2018 21:38:05 +0000 (14:38 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ie2a754e3f768b2de4d5ead7c9809143a0208a323
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 21:26:20 +0000 (21:26 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6

Change-Id: I264d10bc17ca14d813f7626ea8c7f3fc48b7d2b7

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 21:26:12 +0000 (21:26 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d

Change-Id: I19af9b73c3da999252d25aa656b2ee5898b75662

commit | commitdiff | tree

Bill Yi [Thu, 5 Jul 2018 21:25:39 +0000 (14:25 -0700)]

Import translations. DO NOT MERGE

Change-Id: I3f4f14ff10346e7bd3ce6ae49fb7d62b0b97b29f
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 20:56:37 +0000 (20:56 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56

Change-Id: I2021f802764dc2314c721ba918c587f235b0f575

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 20:56:29 +0000 (20:56 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557

Change-Id: Ia499ffa8340bfbf0f2b1ec7dd515ee5cf65f7fb8

commit | commitdiff | tree

Bill Yi [Thu, 5 Jul 2018 20:55:54 +0000 (13:55 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ie0db7263c998f8b70aa35b99d5207ceab763f25c
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 20:32:02 +0000 (20:32 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab

Change-Id: Idb16f83382ec0d792c15733b46fe31a99e89552a

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 20:31:54 +0000 (20:31 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228

Change-Id: Ie556d4be250c4d6f4ade238bb905455aa0454b73

commit | commitdiff | tree

Bill Yi [Thu, 5 Jul 2018 20:31:17 +0000 (13:31 -0700)]

Import translations. DO NOT MERGE

Change-Id: If9dfa14b67b352f0e43cec9c151e75bcaa361e4d
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 20:25:00 +0000 (20:25 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720

Change-Id: I0ff7f8debdd8198ed8e4b61898a27ba116b013f7

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 20:24:50 +0000 (20:24 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e

Change-Id: I8214434dd8cb7b4e173b0ff49e3b5bf7618125f2

commit | commitdiff | tree

Bill Yi [Thu, 5 Jul 2018 20:24:08 +0000 (13:24 -0700)]

Import translations. DO NOT MERGE

Change-Id: I49d05b7d8f35cccb3dfe0fef1b04f5e08490e7de
Auto-generated-cl: translation import

commit | commitdiff | tree

Bernie Innocenti [Mon, 28 May 2018 13:04:37 +0000 (22:04 +0900)]

vpn: allow IPSec traffic through Always-on VPN

This won't leak any traffic outside the VPN as long as there are no
processes owned by uid 0 which generate network traffic (which is
currently the case).

Bug: 69873852
Test: compared the output of 'adb shell ip rule show' before and after
Test: runtest -x frameworks/base/tests/net/java/com/android/server/connectivity/VpnTest.java
Test: local CTS tests run: android.net.cts.VpnServiceTest
Test: local CTS tests run: com.android.cts.devicepolicy.MixedDeviceOwnerTest
Change-Id: I8758e576c9d961d73f62bfcf0559dd7ecee6e8e6
Merged-In: I8758e576c9d961d73f62bfcf0559dd7ecee6e8e6
Merged-In: I1f9b78c8f828ec2df7aba71b39d62be0c4db2550
Merged-In: I8edeb0942e661c8385ff0cd3fdb72e6f62a8f218
(cherry picked from commit 00000fe55a4729f8339afdc7eab5c970b2549813)

commit | commitdiff | tree

Atanas Kirilov [Thu, 28 Jun 2018 00:57:17 +0000 (17:57 -0700)]

Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into oc-dev
am: 8b047ec8a2

Change-Id: I0c6522feec4b1baccf3c2c8ffb0d79bdebedb9b2

commit | commitdiff | tree

Atanas Kirilov [Thu, 28 Jun 2018 00:25:10 +0000 (17:25 -0700)]

Merge "Backport Prevent shortcut info package name spoofing" into oc-dev
am: c6dbcc137e

Change-Id: Ib3becad73fadba2be82e44bc6fb4afc3c1921a6a

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:56:45 +0000 (16:56 -0700)]

Merge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into oc-dev
am: 000036eb4c

Change-Id: Ic71e3f93036902b2d9452c05e7cdb6e4df2fb0e0

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:42:36 +0000 (16:42 -0700)]

Merge "Backporting of b/77821568" into oc-dev
am: 9774459633

Change-Id: Ie0d176b94d15be65918b5f67bf9ed7f49f632def

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:29:41 +0000 (23:29 +0000)]

Merge "RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing" into nyc-mr1-dev

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:29:41 +0000 (23:29 +0000)]

Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into oc-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a am: 06848a3f8f skipped: c3e741e530
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a am: 06848a3f8f
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a
  RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:29:41 +0000 (23:29 +0000)]

Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into nyc-mr2-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a am: 06848a3f8f
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a
  RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:29:41 +0000 (23:29 +0000)]

Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into cw-f-dev

* changes:
[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a
RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:26:08 +0000 (23:26 +0000)]

Merge "Backport Prevent shortcut info package name spoofing" into oc-dev

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:25:42 +0000 (23:25 +0000)]

Merge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into oc-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e am: 0eda2602cd skipped: 430c4395a3
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e am: 0eda2602cd
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c
  RESTRICT AUTOMERGE: Backporting of b/77821568

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:25:42 +0000 (23:25 +0000)]

Merge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into nyc-mr2-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e am: 0eda2602cd
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c
  RESTRICT AUTOMERGE: Backporting of b/77821568

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:25:42 +0000 (23:25 +0000)]

Merge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into cw-f-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c
  RESTRICT AUTOMERGE: Backporting of b/77821568

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:25:27 +0000 (23:25 +0000)]

Merge "Backporting of b/77821568" into oc-dev

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help