OSDN Git Service
Mihai Popa [Wed, 6 Jun 2018 17:01:16 +0000 (10:01 -0700)]
[automerger skipped] Merge changes from topic "am-
2d17369d-a241-482f-bad0-
edb5147de00b" into oc-dev am:
3fce74a7f3 -s ours
am:
bb18c011aa -s ours
Change-Id: I2feb73ce9430daf5ead58675b552be326925af27
Mihai Popa [Wed, 6 Jun 2018 16:33:57 +0000 (09:33 -0700)]
[automerger skipped] Merge changes from topic "am-
2d17369d-a241-482f-bad0-
edb5147de00b" into oc-dev
am:
3fce74a7f3 -s ours
Change-Id: I28ae4102fd8913d74e8dd928f286cbdbd66d0241
Mihai Popa [Wed, 6 Jun 2018 16:21:21 +0000 (16:21 +0000)]
Merge changes from topic "am-
2d17369d-a241-482f-bad0-
edb5147de00b" into oc-dev
* changes:
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c am:
42eaa8f932 am:
a72cb45f89 am:
f5d69aa775 skipped:
94bc67f03c
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c am:
42eaa8f932 am:
a72cb45f89 am:
f5d69aa775
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c am:
42eaa8f932 am:
a72cb45f89
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c am:
42eaa8f932
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c
Optimise the hit test algorithm
Atanas Kirilov [Tue, 5 Jun 2018 22:38:16 +0000 (15:38 -0700)]
Merge changes from topic "am-
f5dc500e-4d32-4849-891e-
c618cef666de" into oc-dev am:
c3b4881ea5
am:
4f74605d11
Change-Id: Id25fb236775c0055f6d9d32b9c67aab5c9acf570
Atanas Kirilov [Tue, 5 Jun 2018 21:24:30 +0000 (14:24 -0700)]
Merge changes from topic "am-
f5dc500e-4d32-4849-891e-
c618cef666de" into oc-dev
am:
c3b4881ea5
Change-Id: Ia58465b88ef5334753094719f4fdbb175b423f24
Atanas Kirilov [Tue, 5 Jun 2018 19:37:52 +0000 (19:37 +0000)]
Merge changes from topic "am-
f5dc500e-4d32-4849-891e-
c618cef666de" into oc-dev
* changes:
[automerger] Make safe label more safe am:
2263da9539 am:
05086b1008 am:
77f449068a am:
46f4563313 am:
6be1d6713f
[automerger] Make safe label more safe am:
2263da9539 am:
05086b1008 am:
77f449068a am:
46f4563313
[automerger] Make safe label more safe am:
2263da9539 am:
05086b1008 am:
77f449068a
[automerger] Make safe label more safe am:
2263da9539 am:
05086b1008
[automerger] Make safe label more safe am:
2263da9539
Make safe label more safe
Android Build Merger (Role) [Tue, 5 Jun 2018 13:49:40 +0000 (13:49 +0000)]
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c am:
42eaa8f932 am:
a72cb45f89 am:
f5d69aa775 skipped:
94bc67f03c
Change-Id: Ieefc1b15d0d1905d16b85df9117e4ce208c342d2
Android Build Merger (Role) [Thu, 31 May 2018 16:46:41 +0000 (16:46 +0000)]
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c am:
42eaa8f932 am:
a72cb45f89 am:
f5d69aa775
Change-Id: Ic2d4d3ead4926ff0f8021725e28aee4ebfc369f3
Merged-In: Ib66ef392c19c937718e7101f6d48fac3abe51ad0
Mihai Popa [Tue, 5 Jun 2018 11:51:17 +0000 (04:51 -0700)]
[automerger skipped] Merge "Optimise the hit test algorithm" into oc-dev am:
6064d8fd4c
am:
0348259446 -s ours
Change-Id: I7ddad2c5dd22f31c812683c4a715dc7738605ff9
Mihai Popa [Tue, 5 Jun 2018 11:39:29 +0000 (04:39 -0700)]
Merge "Optimise the hit test algorithm" into oc-dev
am:
6064d8fd4c
Change-Id: I465c15edb18c3084e6b8cbf1f42c0c2c1ebea4eb
TreeHugger Robot [Tue, 5 Jun 2018 11:28:42 +0000 (11:28 +0000)]
Merge "Optimise the hit test algorithm" into oc-dev
TreeHugger Robot [Tue, 5 Jun 2018 11:28:11 +0000 (11:28 +0000)]
Merge "Optimise the hit test algorithm" into oc-mr1-dev
Adrian Roos [Mon, 4 Jun 2018 18:18:38 +0000 (11:18 -0700)]
Merge "WM: Prevent secondary display focus while keyguard is up" into oc-dev am:
f04714c59a
am:
6281d64277
Change-Id: Ic7b12c406ac5aea0e9f40b5f2c2f72c5efd87212
Adrian Roos [Mon, 4 Jun 2018 17:02:32 +0000 (10:02 -0700)]
Merge "WM: Prevent secondary display focus while keyguard is up" into oc-dev
am:
f04714c59a
Change-Id: I38bab1ff56a30cccb2f748588ffbbe54d5e17e80
TreeHugger Robot [Mon, 4 Jun 2018 11:44:21 +0000 (11:44 +0000)]
Merge "WM: Prevent secondary display focus while keyguard is up" into oc-dev
Android Build Merger (Role) [Thu, 31 May 2018 16:46:34 +0000 (16:46 +0000)]
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c am:
42eaa8f932 am:
a72cb45f89
Change-Id: I9fa897b6bd6b5291d2956a38a3740b4f6d783ab2
Android Build Merger (Role) [Thu, 31 May 2018 16:46:27 +0000 (16:46 +0000)]
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c am:
42eaa8f932
Change-Id: I2ac44759ff615b32724f5235d3e5e8dc8c9b4ced
Android Build Merger (Role) [Thu, 31 May 2018 16:46:17 +0000 (16:46 +0000)]
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c
Change-Id: If1c91f3bc1e785434f153c5bc0d14befbc75e6cb
Mihai Popa [Wed, 9 May 2018 16:31:48 +0000 (17:31 +0100)]
Optimise the hit test algorithm
Layout#getOffsetForHorizontal was running in O(n^2) time, where n is the
length of the current line. The method is used when a touch event
happens on a text line, to compute the cursor offset (and the character)
where it happened. Although this is not an issue in common usecases,
where the number of characters on a line is relatively small, this can
be very inefficient as a consequence of Unicode containing 0-width
(invisible) characters. Specifically, there are characters defining the
text direction (LTR or RTL), which cause our algorithm to touch the
worst case quadratic runtime. For example, a person is able to send a
message containing a few visible characters, and also a lot of these
direction changing invisible ones. When the receiver touches the message
(causing the Layout#getOffsetForHorizontal method to be called), the
receiver's application would become not responsive.
This CL optimizes the method to run in O(n) worst case. This is achieved
by computing the measurements of all line prefixes at first, which can
be done in a single pass. Then, all the prefix measurement queries will
be answered in O(1), rather than O(n) as it was happening before.
Bug:
79215201
Test: manual testing
Change-Id: Ib66ef392c19c937718e7101f6d48fac3abe51ad0
Merged-In: Ib66ef392c19c937718e7101f6d48fac3abe51ad0
Mihai Popa [Wed, 9 May 2018 16:31:48 +0000 (17:31 +0100)]
Optimise the hit test algorithm
Layout#getOffsetForHorizontal was running in O(n^2) time, where n is the
length of the current line. The method is used when a touch event
happens on a text line, to compute the cursor offset (and the character)
where it happened. Although this is not an issue in common usecases,
where the number of characters on a line is relatively small, this can
be very inefficient as a consequence of Unicode containing 0-width
(invisible) characters. Specifically, there are characters defining the
text direction (LTR or RTL), which cause our algorithm to touch the
worst case quadratic runtime. For example, a person is able to send a
message containing a few visible characters, and also a lot of these
direction changing invisible ones. When the receiver touches the message
(causing the Layout#getOffsetForHorizontal method to be called), the
receiver's application would become not responsive.
This CL optimizes the method to run in O(n) worst case. This is achieved
by computing the measurements of all line prefixes at first, which can
be done in a single pass. Then, all the prefix measurement queries will
be answered in O(1), rather than O(n) as it was happening before.
Bug:
79215201
Test: manual testing
Change-Id: Ib66ef392c19c937718e7101f6d48fac3abe51ad0
Merged-In: Ib66ef392c19c937718e7101f6d48fac3abe51ad0
Mihai Popa [Wed, 9 May 2018 16:31:48 +0000 (17:31 +0100)]
Optimise the hit test algorithm
Layout#getOffsetForHorizontal was running in O(n^2) time, where n is the
length of the current line. The method is used when a touch event
happens on a text line, to compute the cursor offset (and the character)
where it happened. Although this is not an issue in common usecases,
where the number of characters on a line is relatively small, this can
be very inefficient as a consequence of Unicode containing 0-width
(invisible) characters. Specifically, there are characters defining the
text direction (LTR or RTL), which cause our algorithm to touch the
worst case quadratic runtime. For example, a person is able to send a
message containing a few visible characters, and also a lot of these
direction changing invisible ones. When the receiver touches the message
(causing the Layout#getOffsetForHorizontal method to be called), the
receiver's application would become not responsive.
This CL optimizes the method to run in O(n) worst case. This is achieved
by computing the measurements of all line prefixes at first, which can
be done in a single pass. Then, all the prefix measurement queries will
be answered in O(1), rather than O(n) as it was happening before.
Bug:
79215201
Test: manual testing
Change-Id: Ib66ef392c19c937718e7101f6d48fac3abe51ad0
Merged-In: Ib66ef392c19c937718e7101f6d48fac3abe51ad0
Benedict Wong [Wed, 30 May 2018 23:00:13 +0000 (23:00 +0000)]
Merge changes from topic "vpn-meteredness" into oc-mr1-dev
* changes:
DO NOT MERGE: Add unit tests to ensure VPN meteredness
DO NOT MERGE: Fix ConnectivityController meteredness checks
Jakub Pawlowski [Wed, 30 May 2018 01:49:17 +0000 (18:49 -0700)]
[automerger skipped] Fix bad type for txPower in PeriodicAdvertisingReport serialization am:
459888be84
am:
bc45dc9536 -s ours
Change-Id: I087f8de352c5c61db32d95ee8c47b6ab0bd171e2
Jakub Pawlowski [Wed, 30 May 2018 00:50:07 +0000 (17:50 -0700)]
Fix bad type for txPower in PeriodicAdvertisingReport serialization
am:
459888be84
Change-Id: Ibccfb97e0b41a9ef6af9fcb1da23870dbff7f9b9
Jakub Pawlowski [Fri, 8 Dec 2017 06:56:03 +0000 (22:56 -0800)]
Fix bad type for txPower in PeriodicAdvertisingReport serialization
Bug:
69634768
Test: compilation
Change-Id: Icedfbaf1ba933637e935ada0fd98aea42c73f2b2
Merged-In: Icedfbaf1ba933637e935ada0fd98aea42c73f2b2
Benedict Wong [Tue, 20 Feb 2018 23:19:59 +0000 (15:19 -0800)]
DO NOT MERGE: Add unit tests to ensure VPN meteredness
These new tests ensure that VPNs report the meteredness of their
underlying networks correctly. The added test verifies VPN meteredness
for cases of metered and unmetered WiFi and Cell
Bug:
78644887
Test: This; ran on walleye-eng
Change-Id: I28bdc71a336bfd97f7908455d4781d774df44b87
Adrian Roos [Tue, 22 May 2018 14:56:35 +0000 (16:56 +0200)]
WM: Prevent secondary display focus while keyguard is up
Fixes an issue where input intended for the keyguard could end up going
to a different display.
To prevent this, make sure that only the default display can get focused
when the keyguard is showing.
Change-Id: I6463c44aedca06930d2c9bda7c45ffd93141308c
Merged-In: I6463c44aedca06930d2c9bda7c45ffd93141308c
Fixes:
71786287
Test: atest DisplayContentTests
Benedict Wong [Fri, 4 May 2018 04:07:58 +0000 (21:07 -0700)]
DO NOT MERGE: Fix ConnectivityController meteredness checks
This patch corrects ConnectivityController's meteredness checks to
perform correct meteredness checks while VPNs are running. This fixes a
bug in O-MR1 where any apps using the DownloadProvider with unmetered
network constraints fail to start while the VPN is enabled.
This change adds a bespoke method for ConnectivityController, allowing
it to correctly identify the meteredness without affecting public API
surfaces.
Bug:
78644887
Test: Built, flashed on Walleye, and tested.
Test: Additional test coverage in subsequent patch(es).
Change-Id: Ie1d11d93d51d936ce81cd5984af61bde30325983
Android Build Merger (Role) [Tue, 22 May 2018 21:59:45 +0000 (21:59 +0000)]
[automerger] Make safe label more safe am:
2263da9539 am:
05086b1008 am:
77f449068a am:
46f4563313 am:
6be1d6713f
Change-Id: I68cc7356fb9069b8e59913e5524955c241990c8c
Android Build Merger (Role) [Tue, 22 May 2018 21:59:39 +0000 (21:59 +0000)]
[automerger] Make safe label more safe am:
2263da9539 am:
05086b1008 am:
77f449068a am:
46f4563313
Change-Id: I49cbda7a4d9643808cc9c164970a6ee630b2233c
Android Build Merger (Role) [Tue, 22 May 2018 21:59:34 +0000 (21:59 +0000)]
[automerger] Make safe label more safe am:
2263da9539 am:
05086b1008 am:
77f449068a
Change-Id: I0f74a4a39349e7c45f1468776618e360be87090c
Android Build Merger (Role) [Tue, 22 May 2018 21:59:30 +0000 (21:59 +0000)]
[automerger] Make safe label more safe am:
2263da9539 am:
05086b1008
Change-Id: Ibf0d6da3ef712a2cc45587d59880ddce03a34447
Android Build Merger (Role) [Tue, 22 May 2018 21:59:24 +0000 (21:59 +0000)]
[automerger] Make safe label more safe am:
2263da9539
Change-Id: If833354e5ae2b056de124fe23f0414c7654f6c33
Todd Kennedy [Thu, 3 May 2018 09:05:04 +0000 (10:05 +0100)]
Make safe label more safe
* limit the absolute maximum size of the label to 50000 characters
[which is probably far more than necessary, but, can be dialed down]
* use a string buffer while processing the string [instead of creating
multiple string objects]
Bug:
62537081
Test: Manual. Install APK in bug and see that it can be uninstalled
Change-Id: Ibf63c2691ad7438a123e92110d95b1f50050f8b1
Merged-In: Ibf63c2691ad7438a123e92110d95b1f50050f8b1
Bill Yi [Mon, 21 May 2018 17:28:44 +0000 (10:28 -0700)]
Merge changes from topic "am-
d326b840-2575-4e69-8ec2-
5cfa14046328" into oc-dev am:
99e6aa1b1e
am:
d88c6877da
Change-Id: I0acd60a59fcb928752ce7bf952bbfe9f65b68ff4
Bill Yi [Mon, 21 May 2018 17:24:41 +0000 (10:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f72be588eb skipped:
ea0127f477 am:
4f1f428661 -s ours
am:
a53d91e485 -s ours
Change-Id: Ife13f7c8262521ddc28deb4ceaf5b27b9765c792
Bill Yi [Mon, 21 May 2018 17:19:31 +0000 (10:19 -0700)]
Merge changes from topic "am-
d326b840-2575-4e69-8ec2-
5cfa14046328" into oc-dev
am:
99e6aa1b1e
Change-Id: Id35ca83236112898b4e39b3cb173be70c435168f
Bill Yi [Mon, 21 May 2018 17:17:56 +0000 (10:17 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f72be588eb skipped:
ea0127f477
am:
4f1f428661 -s ours
Change-Id: Iac8c22f36859d6648ae856236c9a97080238cae5
TreeHugger Robot [Mon, 21 May 2018 17:03:49 +0000 (17:03 +0000)]
Merge changes from topic "am-
d326b840-2575-4e69-8ec2-
5cfa14046328" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
f72be588eb
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 21 May 2018 17:03:49 +0000 (17:03 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Mon, 21 May 2018 17:03:49 +0000 (17:03 +0000)]
Merge changes from topic "am-
d326b840-2575-4e69-8ec2-
5cfa14046328" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
f72be588eb skipped:
ea0127f477
[automerger skipped] Import translations. DO NOT MERGE skipped:
f72be588eb
Import translations. DO NOT MERGE
Bill Yi [Fri, 18 May 2018 01:14:50 +0000 (18:14 -0700)]
Merge changes from topic "am-
99e79364-ab71-4d96-8a34-
000c07c66d3e" into oc-dev am:
abf0ff542a
am:
4d58eb3bc1
Change-Id: I9bdbdaadbe40bba74e9ca9186e88d6881c25e022
Bill Yi [Fri, 18 May 2018 01:09:52 +0000 (18:09 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c2a85c8927 skipped:
43bd9fa8b2 am:
f028e75015 -s ours
am:
c22431c753 -s ours
Change-Id: I186355d9122a1eb12b968ff05e91a631f1189b45
Bill Yi [Fri, 18 May 2018 01:03:39 +0000 (18:03 -0700)]
Merge changes from topic "am-
e925dddc-33b5-48cc-bddb-
e978735e99b7" into oc-dev am:
c844ea5c96
am:
44042a74c7
Change-Id: I39a0f64a8a2cb75fee5d9caf50c249f43637762f
Bill Yi [Fri, 18 May 2018 00:58:50 +0000 (17:58 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
2f53cb7cc0 skipped:
ead9437423 am:
f3df46779d -s ours
am:
2fe6455d18 -s ours
Change-Id: Iddb6db689a98d1f569e79da1a96d716c49cdd5e0
Bill Yi [Fri, 18 May 2018 00:52:28 +0000 (17:52 -0700)]
Merge changes from topic "am-
3142fca9-100b-4dd4-8848-
117761166ffe" into oc-dev am:
a86ba9b6e5
am:
7c05674594
Change-Id: I8da971740edb6e110fc02bc5ae4e92a3072b3637
Bill Yi [Fri, 18 May 2018 00:47:23 +0000 (17:47 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7b2e87bd96 skipped:
913239f688 am:
1c6bdf5174 -s ours
am:
a1df530ac7 -s ours
Change-Id: I06393327f4c6cfd8c5c6e4e17d19e2b21817b040
Bill Yi [Fri, 18 May 2018 00:41:19 +0000 (17:41 -0700)]
Merge changes from topic "am-
4a0c0e3d-b1ad-44cf-9088-
b37a160bc2ac" into oc-dev am:
70060539aa
am:
aaddf187e4
Change-Id: I674bd5be030c34e37443c8746c40bcae2704e1b2
Bill Yi [Fri, 18 May 2018 00:35:54 +0000 (17:35 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
63cef597e2 skipped:
a492d4d55b am:
6959e2b475 -s ours
am:
eef34578b3 -s ours
Change-Id: Ic0a169bd1c11dec7e4bcc8d7a8a2a9ba30d72a6b
Bill Yi [Fri, 18 May 2018 00:29:10 +0000 (17:29 -0700)]
Merge changes from topic "am-
d375c8a9-01d8-44da-9ef2-
2e866e457b89" into oc-dev am:
e936691bfc
am:
1ea636faa9
Change-Id: I26d60740cd9afc04529a9fb431786c7829ef84f6
Bill Yi [Fri, 18 May 2018 00:23:00 +0000 (17:23 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
439fdb13fc skipped:
a98b588532 am:
1221af165e -s ours
am:
aa961b929b -s ours
Change-Id: Ic0790355c37d9f3501b519dc773466a53f41b3cc
Bill Yi [Fri, 18 May 2018 00:10:29 +0000 (17:10 -0700)]
Merge changes from topic "am-
646cf556-d36a-48f1-a414-
3797586a8a96" into oc-dev am:
ea5a5f49cc
am:
5897727afc
Change-Id: I9fa868feb79839c8090ba44901c09602d48a00d9
Bill Yi [Fri, 18 May 2018 00:09:03 +0000 (17:09 -0700)]
Merge changes from topic "am-
99e79364-ab71-4d96-8a34-
000c07c66d3e" into oc-dev
am:
abf0ff542a
Change-Id: Id3b645350fefaee4071d56d6e4bd368fa535350e
Bill Yi [Fri, 18 May 2018 00:07:40 +0000 (17:07 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c2a85c8927 skipped:
43bd9fa8b2
am:
f028e75015 -s ours
Change-Id: I7415cd61d98275b3d07e17efa2be8026a2a6b6d5
Bill Yi [Fri, 18 May 2018 00:05:08 +0000 (17:05 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a574713e4d skipped:
e7c60be83f am:
4bfac58817 -s ours
am:
60682c726c -s ours
Change-Id: I43fa56442b50d3935f9769de2fc22bcfb8f38f6f
Bill Yi [Fri, 18 May 2018 00:03:27 +0000 (17:03 -0700)]
Merge changes from topic "am-
e925dddc-33b5-48cc-bddb-
e978735e99b7" into oc-dev
am:
c844ea5c96
Change-Id: Iccd345fb289c4daae404186709dccd4e8fb67fd1
Bill Yi [Fri, 18 May 2018 00:01:48 +0000 (17:01 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
2f53cb7cc0 skipped:
ead9437423
am:
f3df46779d -s ours
Change-Id: I84b536b9e12331834feb59bbe3c58b554506f259
Bill Yi [Thu, 17 May 2018 23:57:51 +0000 (16:57 -0700)]
Merge changes from topic "am-
76a20f08-9212-4001-a52b-
dd38a93faa9b" into oc-dev am:
9ede115c2b
am:
43539011e4
Change-Id: I64ee4058dd334bd0be975016361fa97c905a598d
Bill Yi [Thu, 17 May 2018 23:55:51 +0000 (16:55 -0700)]
Merge changes from topic "am-
3142fca9-100b-4dd4-8848-
117761166ffe" into oc-dev
am:
a86ba9b6e5
Change-Id: I46efd01a25ff71885d5573e28731593a1cebb865
Bill Yi [Thu, 17 May 2018 23:53:52 +0000 (16:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7b2e87bd96 skipped:
913239f688
am:
1c6bdf5174 -s ours
Change-Id: If7d661f6e4fb7d74843ab3a948dba40b7349be55
Bill Yi [Thu, 17 May 2018 23:52:04 +0000 (16:52 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
053b375862 skipped:
a7875e6a7d am:
81a6ef98f3 -s ours
am:
4fb03f2730 -s ours
Change-Id: I0eddfd0423b803df34e4134c294bb58bf165f688
Bill Yi [Thu, 17 May 2018 23:48:54 +0000 (16:48 -0700)]
Merge changes from topic "am-
4a0c0e3d-b1ad-44cf-9088-
b37a160bc2ac" into oc-dev
am:
70060539aa
Change-Id: I871256a76c3af4e37959f729389114c694e15596
Bill Yi [Thu, 17 May 2018 23:46:58 +0000 (16:46 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
63cef597e2 skipped:
a492d4d55b
am:
6959e2b475 -s ours
Change-Id: I6951039ef2fc1a8770698c6da24944b3cb81ff2a
Bill Yi [Thu, 17 May 2018 23:45:06 +0000 (16:45 -0700)]
Merge changes from topic "am-
d1fbdf53-dccb-4215-99ff-
b24698b6bec8" into oc-dev am:
c6c611293d
am:
b2f28267ad
Change-Id: If282600586310eb4dc03523f4883ff15ac2db651
Bill Yi [Thu, 17 May 2018 23:43:04 +0000 (16:43 -0700)]
Merge changes from topic "am-
d375c8a9-01d8-44da-9ef2-
2e866e457b89" into oc-dev
am:
e936691bfc
Change-Id: I00cd12299a177549e980a01c5e8328306663bbee
Bill Yi [Thu, 17 May 2018 23:40:57 +0000 (16:40 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
439fdb13fc skipped:
a98b588532
am:
1221af165e -s ours
Change-Id: I87afb96b009dbc4bfbc152d5764bc8728f0b0fef
Bill Yi [Thu, 17 May 2018 23:39:55 +0000 (16:39 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
379dacd8c2 skipped:
20306f6ce0 am:
fb795ed727 -s ours
am:
c31d960f5e -s ours
Change-Id: I43fdbbc880a880f61b86a1f9e569f8c65196d65b
Bill Yi [Thu, 17 May 2018 23:36:39 +0000 (16:36 -0700)]
Merge changes from topic "am-
646cf556-d36a-48f1-a414-
3797586a8a96" into oc-dev
am:
ea5a5f49cc
Change-Id: Ib4683b9918a30e45b255e03b5dc5b38567b0bbe9
Bill Yi [Thu, 17 May 2018 23:35:10 +0000 (16:35 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a574713e4d skipped:
e7c60be83f
am:
4bfac58817 -s ours
Change-Id: I910a028d8a4945d0dbbd6334b1d95fc85dd162a1
Bill Yi [Thu, 17 May 2018 23:34:41 +0000 (16:34 -0700)]
Merge changes from topic "am-
93ef86f6-d908-4917-b503-
5ba7fcefcad8" into oc-dev am:
5667f966e5
am:
e2790f5d0f
Change-Id: Ifa350e4e880263f58b6eb5ade4fdee5427fcb08b
Bill Yi [Thu, 17 May 2018 23:31:32 +0000 (16:31 -0700)]
Merge changes from topic "am-
76a20f08-9212-4001-a52b-
dd38a93faa9b" into oc-dev
am:
9ede115c2b
Change-Id: Ida64b0840ce3569aa8a3ca5bb82a08de30ba3a23
Bill Yi [Thu, 17 May 2018 23:30:03 +0000 (16:30 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
fc4347f98e skipped:
8b2ac4fffa am:
a72fe6a957 -s ours
am:
dc9639ab7f -s ours
Change-Id: Ib6ede43f9ed266ca41dffc03cc26422471b2afe2
Bill Yi [Thu, 17 May 2018 23:29:55 +0000 (16:29 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
053b375862 skipped:
a7875e6a7d
am:
81a6ef98f3 -s ours
Change-Id: I653ae63bef34f046ac9fc9be7d0e04d818dd0d89
Bill Yi [Thu, 17 May 2018 23:26:51 +0000 (16:26 -0700)]
Merge changes from topic "am-
d1fbdf53-dccb-4215-99ff-
b24698b6bec8" into oc-dev
am:
c6c611293d
Change-Id: I74ee0d6e477345487b6056b3e1f92a41ba67731f
Bill Yi [Thu, 17 May 2018 23:25:01 +0000 (16:25 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
379dacd8c2 skipped:
20306f6ce0
am:
fb795ed727 -s ours
Change-Id: Id3bd937bf2aecd644b6c5ec4de4d8707196267f5
TreeHugger Robot [Thu, 17 May 2018 23:23:10 +0000 (23:23 +0000)]
Merge changes from topic "am-
99e79364-ab71-4d96-8a34-
000c07c66d3e" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
c2a85c8927
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 17 May 2018 23:23:10 +0000 (23:23 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 17 May 2018 23:23:10 +0000 (23:23 +0000)]
Merge changes from topic "am-
99e79364-ab71-4d96-8a34-
000c07c66d3e" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
c2a85c8927 skipped:
43bd9fa8b2
[automerger skipped] Import translations. DO NOT MERGE skipped:
c2a85c8927
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 17 May 2018 23:22:37 +0000 (23:22 +0000)]
Merge changes from topic "am-
e925dddc-33b5-48cc-bddb-
e978735e99b7" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
2f53cb7cc0 skipped:
ead9437423
[automerger skipped] Import translations. DO NOT MERGE skipped:
2f53cb7cc0
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 17 May 2018 23:22:37 +0000 (23:22 +0000)]
Merge changes from topic "am-
e925dddc-33b5-48cc-bddb-
e978735e99b7" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
2f53cb7cc0
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 17 May 2018 23:22:37 +0000 (23:22 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 17 May 2018 23:21:49 +0000 (23:21 +0000)]
Merge changes from topic "am-
3142fca9-100b-4dd4-8848-
117761166ffe" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
7b2e87bd96 skipped:
913239f688
[automerger skipped] Import translations. DO NOT MERGE skipped:
7b2e87bd96
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 17 May 2018 23:21:49 +0000 (23:21 +0000)]
Merge changes from topic "am-
3142fca9-100b-4dd4-8848-
117761166ffe" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
7b2e87bd96
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 17 May 2018 23:21:49 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 17 May 2018 23:20:31 +0000 (23:20 +0000)]
Merge changes from topic "am-
4a0c0e3d-b1ad-44cf-9088-
b37a160bc2ac" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
63cef597e2 skipped:
a492d4d55b
[automerger skipped] Import translations. DO NOT MERGE skipped:
63cef597e2
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 17 May 2018 23:20:31 +0000 (23:20 +0000)]
Merge changes from topic "am-
4a0c0e3d-b1ad-44cf-9088-
b37a160bc2ac" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
63cef597e2
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 17 May 2018 23:20:31 +0000 (23:20 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Thu, 17 May 2018 23:20:16 +0000 (16:20 -0700)]
Merge changes from topic "am-
93ef86f6-d908-4917-b503-
5ba7fcefcad8" into oc-dev
am:
5667f966e5
Change-Id: Iba9987a2228227107c2870f2a57b4c132e3f6e3e
Bill Yi [Thu, 17 May 2018 23:19:50 +0000 (16:19 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a52a0f49cc skipped:
a5619cc4e3 am:
19bf5aa466 -s ours
am:
22961acba1 -s ours
Change-Id: I945ab1ecad9290ba64bad8b93fe7614b9a9778ae
Bill Yi [Thu, 17 May 2018 23:18:59 +0000 (16:18 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
fc4347f98e skipped:
8b2ac4fffa
am:
a72fe6a957 -s ours
Change-Id: I659644d1abcb04788c35591a290440e8a990e79c
TreeHugger Robot [Thu, 17 May 2018 23:17:54 +0000 (23:17 +0000)]
Merge changes from topic "am-
d375c8a9-01d8-44da-9ef2-
2e866e457b89" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
439fdb13fc skipped:
a98b588532
[automerger skipped] Import translations. DO NOT MERGE skipped:
439fdb13fc
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 17 May 2018 23:17:54 +0000 (23:17 +0000)]
Merge changes from topic "am-
d375c8a9-01d8-44da-9ef2-
2e866e457b89" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
439fdb13fc
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 17 May 2018 23:17:54 +0000 (23:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 17 May 2018 23:17:28 +0000 (23:17 +0000)]
Merge changes from topic "am-
646cf556-d36a-48f1-a414-
3797586a8a96" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
a574713e4d skipped:
e7c60be83f
[automerger skipped] Import translations. DO NOT MERGE skipped:
a574713e4d
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 17 May 2018 23:17:28 +0000 (23:17 +0000)]
Merge changes from topic "am-
646cf556-d36a-48f1-a414-
3797586a8a96" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
a574713e4d
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 17 May 2018 23:17:28 +0000 (23:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 17 May 2018 23:16:59 +0000 (23:16 +0000)]
Merge changes from topic "am-
76a20f08-9212-4001-a52b-
dd38a93faa9b" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
053b375862 skipped:
a7875e6a7d
[automerger skipped] Import translations. DO NOT MERGE skipped:
053b375862
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 17 May 2018 23:16:59 +0000 (23:16 +0000)]
Merge changes from topic "am-
76a20f08-9212-4001-a52b-
dd38a93faa9b" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
053b375862
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 17 May 2018 23:16:59 +0000 (23:16 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Thu, 17 May 2018 23:15:13 +0000 (16:15 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a52a0f49cc skipped:
a5619cc4e3
am:
19bf5aa466 -s ours
Change-Id: I99a15ef8e43c65f65d99c83c27d8779bbf03f864
OSDN Git Service
