OSDN Git Service
Bill Yi [Thu, 12 Jul 2018 20:08:42 +0000 (13:08 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e059d5fb83 skipped:
e97378c657 am:
9935787f3b -s ours
am:
bf789ba0d1 -s ours
Change-Id: I157f816f170fc9af6263e552a46612fab2760f63
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
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
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
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
Arthur Ishiguro [Wed, 11 Jul 2018 21:27:45 +0000 (14:27 -0700)]
[automerger] Resolve inconsistent parcel read in NanoAppFilter am:
abe5a73a4a am:
2895b320b4 am:
77e6e34644 am:
49e97ea1dc am:
c2cfe453f2 am:
cab2fa779e
am:
bf8733b162
Change-Id: I4fe6469031d7ef6fcc6d9b46da4dbc5845ea62d2
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
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
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
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
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
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
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
Bill Yi [Fri, 6 Jul 2018 05:36:46 +0000 (22:36 -0700)]
Merge changes from topic "am-
59bde7f2-9903-448c-9ad1-
8364ed396cf3" into oc-dev am:
cec93100ea
am:
7557661787
Change-Id: I543dafa974e9f5c677957fd19d6f03fcf796213a
Bill Yi [Fri, 6 Jul 2018 05:30:27 +0000 (22:30 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c28b092c5e skipped:
33cf864720 am:
c6d9bee144 -s ours
am:
bf6bbefe57 -s ours
Change-Id: Ife52c79c0b85d9f09f1d2cf7b792239aaae24868
Bill Yi [Fri, 6 Jul 2018 05:25:31 +0000 (22:25 -0700)]
Merge changes from topic "am-
8b8b3d01-a327-4923-ae09-
35940a00b1b3" into oc-dev am:
72e16b1754
am:
af687adf49
Change-Id: I3885703da8f3f7bfe6b72c25d1f3ed19d6aeac9a
Bill Yi [Fri, 6 Jul 2018 05:18:16 +0000 (22:18 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e35f1fdbae skipped:
39c48a1168 am:
a05627322f -s ours
am:
a8276b8de4 -s ours
Change-Id: I13817952fd66ca2501a35a0e1223bc7d932a2ddc
Bill Yi [Fri, 6 Jul 2018 05:12:53 +0000 (22:12 -0700)]
Merge changes from topic "am-
5c22e81a-5f3d-46c4-9d8f-
58c6edfac103" into oc-dev am:
6005492cb2
am:
851e826783
Change-Id: I1b866e81f48a4d642657cd963fd8e04faa3c1537
Bill Yi [Fri, 6 Jul 2018 05:05:37 +0000 (22:05 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
ff2f705557 skipped:
4740838b56 am:
8700285134 -s ours
am:
f2ea6f55d9 -s ours
Change-Id: Ic88b3b3dcc9ed3148c6e3d150705e7f40b36c8d0
Bill Yi [Fri, 6 Jul 2018 05:00:12 +0000 (22:00 -0700)]
Merge changes from topic "am-
dd912fb1-a10b-413b-b531-
a015abbbf9e3" into oc-dev am:
37d9749e81
am:
b434b0c169
Change-Id: I817b45781ecea994292c346d9e3bd4584e0f2d1f
Bill Yi [Fri, 6 Jul 2018 04:53:26 +0000 (21:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f02d29629d skipped:
ace44c1ee6 am:
eacf5ffefb -s ours
am:
67f18d810a -s ours
Change-Id: Ifaeaf651a92fd5bd261180f0aaa68bb2da521fc0
Bill Yi [Fri, 6 Jul 2018 04:48:16 +0000 (21:48 -0700)]
Merge changes from topic "am-
20b78215-c47d-481a-9e96-
79127da1c87c" into oc-dev am:
c1dc805861
am:
812ec62a14
Change-Id: I66ce801571d91b5e3791a57cebfe9b56715515b7
Bill Yi [Fri, 6 Jul 2018 04:41:17 +0000 (21:41 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
32c08741ec skipped:
8062f299b1 am:
998f40e6c5 -s ours
am:
fcca5bb731 -s ours
Change-Id: Ib39dfb279c982016f6102a4ee6d26e6e5f925d91
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
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
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
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
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
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
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
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
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
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
Bill Yi [Fri, 6 Jul 2018 03:23:45 +0000 (20:23 -0700)]
Merge changes from topic "am-
5f59ad6e-1c79-44f8-a437-
eac2cc321cdf" into oc-dev am:
ec4d649d8f
am:
f051b28554
Change-Id: Ia57f2327964435888de185ed3cd461f6299daa62
Bill Yi [Fri, 6 Jul 2018 03:16:48 +0000 (20:16 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cd4aea64f6 skipped:
f028c34cdc am:
9204ce40e4 -s ours
am:
e45b804b65 -s ours
Change-Id: Iae41c56e1a5007b66a1a880d1ef5e4a351a5ca63
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
Bill Yi [Fri, 6 Jul 2018 03:02:41 +0000 (20:02 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f8ecf21228 skipped:
b586d4e9ab am:
b3bf111bd5 -s ours
am:
4065ce8773 -s ours
Change-Id: I2f05f7f47f5e7aed365bee09afc30b019cb73993
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
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
TreeHugger Robot [Fri, 6 Jul 2018 02:55:05 +0000 (02:55 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
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
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
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
TreeHugger Robot [Fri, 6 Jul 2018 02:50:29 +0000 (02:50 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
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
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
TreeHugger Robot [Fri, 6 Jul 2018 02:46:51 +0000 (02:46 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
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
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
TreeHugger Robot [Fri, 6 Jul 2018 02:46:29 +0000 (02:46 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
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
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
TreeHugger Robot [Fri, 6 Jul 2018 02:45:57 +0000 (02:45 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
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
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
TreeHugger Robot [Fri, 6 Jul 2018 02:45:27 +0000 (02:45 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Atanas Kirilov [Thu, 28 Jun 2018 01:27:10 +0000 (18:27 -0700)]
Merge changes from topic "am-
32ac52b1-d1ae-4650-b9ae-
368d8cd519cb" into oc-dev am:
8b047ec8a2
am:
245cc0559f
Change-Id: I904c603cf4838f12067b9548058b85e53a843fd0
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
Atanas Kirilov [Thu, 28 Jun 2018 00:37:57 +0000 (17:37 -0700)]
Merge "Backport Prevent shortcut info package name spoofing" into oc-dev am:
c6dbcc137e
am:
dcc95b94f8
Change-Id: I23209ea505140a48177b1b4fe78d36699240653e
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
Atanas Kirilov [Thu, 28 Jun 2018 00:21:25 +0000 (17:21 -0700)]
Merge changes from topic "am-
8acf63d1-cfe0-4950-98c3-
1d2367987749" into oc-dev am:
000036eb4c
am:
00bf4c5b5c
Change-Id: I5cfc94bc9781c29a423a95a43d775e6bea6271b7
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
Atanas Kirilov [Wed, 27 Jun 2018 23:56:36 +0000 (16:56 -0700)]
Merge "Backporting of b/
77821568" into oc-dev am:
9774459633
am:
f3f6e2f9ee
Change-Id: I1445ecb89dba24df5e89089fbf0aff308331aea0
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
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
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
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
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
Atanas Kirilov [Wed, 27 Jun 2018 23:26:08 +0000 (23:26 +0000)]
Merge "Backport Prevent shortcut info package name spoofing" into oc-dev
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
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
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
Atanas Kirilov [Wed, 27 Jun 2018 23:25:27 +0000 (23:25 +0000)]
Merge "Backporting of b/
77821568" into oc-dev
TreeHugger Robot [Thu, 21 Jun 2018 21:00:27 +0000 (21:00 +0000)]
Merge "Catch unbinding errors" into oc-mr1-dev
Bill Yi [Mon, 18 Jun 2018 07:09:08 +0000 (00:09 -0700)]
Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into oc-dev am:
3c047ea7fa
am:
3cca4e7b06
Change-Id: Ifaa547b16411e79759647dd9cc53ea76526f5e5d
Bill Yi [Mon, 18 Jun 2018 07:02:54 +0000 (00:02 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4 skipped:
b06ba83b23 am:
437da4c13d -s ours
am:
f57c14b641 -s ours
Change-Id: Id5433baa969e08bd0253cb921bdaa541a1eaad3a
Bill Yi [Mon, 18 Jun 2018 06:55:44 +0000 (23:55 -0700)]
Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into oc-dev
am:
3c047ea7fa
Change-Id: Ie97567da2988d921748f9b4ca86f658a5222f43b
Bill Yi [Mon, 18 Jun 2018 06:53:27 +0000 (23:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4 skipped:
b06ba83b23
am:
437da4c13d -s ours
Change-Id: I8227403ab7fa849fcc096d3a0acfa583843abf3b
OSDN Git Service
