OSDN Git Service

android-x86/frameworks-base.git
5 years agoRESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters.
Abodunrinwa Toki [Fri, 4 Jan 2019 17:18:39 +0000 (17:18 +0000)]
RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters.

Also don't show smart actions for selections in text with unsupported
characters.

Bug: 116321860
Test: runtest -x cts/tests/tests/text/src/android/text/util/cts/LinkifyTest.java
Change-Id: Ib2ee544b5783234fba8ee2f93adf0b36b039520f

5 years ago[automerger skipped] [automerger] Adding SUPL NI Emergency Extension Time am: 64306e1...
WyattRiley [Fri, 21 Dec 2018 19:17:41 +0000 (11:17 -0800)]
[automerger skipped] [automerger] Adding SUPL NI Emergency Extension Time am: 64306e1e7b am: 882e4e7ba0 am: 478d13d664 am: 17232346f0 skipped: 46f972fea5 am: 5cf98f1399  -s ours
am: 5420e91d1e  -s ours

Change-Id: I9ca3e797b1efe6c41e3dd958dd2657a467f690f7

5 years ago[automerger skipped] [automerger] Adding SUPL NI Emergency Extension Time am: 64306e1...
WyattRiley [Fri, 21 Dec 2018 19:07:09 +0000 (11:07 -0800)]
[automerger skipped] [automerger] Adding SUPL NI Emergency Extension Time am: 64306e1e7b am: 882e4e7ba0 am: 478d13d664 am: 17232346f0 skipped: 46f972fea5
am: 5cf98f1399  -s ours

Change-Id: Ic83aa8cd0eb564e27264dfb3f929bc86fe7ec4f6

5 years ago[automerger] Adding SUPL NI Emergency Extension Time am: 64306e1e7b am: 882e4e7ba0...
Android Build Merger (Role) [Fri, 21 Dec 2018 16:50:53 +0000 (16:50 +0000)]
[automerger] Adding SUPL NI Emergency Extension Time am: 64306e1e7b am: 882e4e7ba0 am: 478d13d664 am: 17232346f0 skipped: 46f972fea5

Change-Id: I93997d7383990bd70492944411196c8fbb6b319e

5 years ago[automerger] Adding SUPL NI Emergency Extension Time am: 64306e1e7b am: 882e4e7ba0...
Android Build Merger (Role) [Fri, 21 Dec 2018 16:49:09 +0000 (16:49 +0000)]
[automerger] Adding SUPL NI Emergency Extension Time am: 64306e1e7b am: 882e4e7ba0 am: 478d13d664 am: 17232346f0

Change-Id: I896fbc8000b44041f54f7e314eb1b970c4644389

5 years ago[automerger] Adding SUPL NI Emergency Extension Time am: 64306e1e7b am: 882e4e7ba0...
Android Build Merger (Role) [Fri, 21 Dec 2018 16:49:03 +0000 (16:49 +0000)]
[automerger] Adding SUPL NI Emergency Extension Time am: 64306e1e7b am: 882e4e7ba0 am: 478d13d664

Change-Id: Ifd8d821683c3c61e2a0e10ac4ce0c24e74e06282

5 years ago[automerger] Adding SUPL NI Emergency Extension Time am: 64306e1e7b am: 882e4e7ba0
Android Build Merger (Role) [Fri, 21 Dec 2018 16:48:57 +0000 (16:48 +0000)]
[automerger] Adding SUPL NI Emergency Extension Time am: 64306e1e7b am: 882e4e7ba0

Change-Id: I2bb3f878634f4ab80f400fccbd4d1fe6610e5a82

5 years ago[automerger] Adding SUPL NI Emergency Extension Time am: 64306e1e7b
Android Build Merger (Role) [Fri, 21 Dec 2018 16:48:50 +0000 (16:48 +0000)]
[automerger] Adding SUPL NI Emergency Extension Time am: 64306e1e7b

Change-Id: I944dc076c63ba9fd5101bc0366a342e057a13d47

5 years agoAdding SUPL NI Emergency Extension Time am: 1cd7883a76
WyattRiley [Fri, 21 Dec 2018 01:31:48 +0000 (17:31 -0800)]
Adding SUPL NI Emergency Extension Time am: 1cd7883a76
am: 75c5850b4c

Change-Id: I8a8d54e909fcf43f3ce421b5f893337251544e75

5 years agoAdding SUPL NI Emergency Extension Time
WyattRiley [Fri, 21 Dec 2018 01:23:22 +0000 (17:23 -0800)]
Adding SUPL NI Emergency Extension Time
am: 1cd7883a76

Change-Id: I22286211589cbcc8739c5dfed3a839bada35646a

5 years agoAdding SUPL NI Emergency Extension Time
WyattRiley [Thu, 6 Dec 2018 19:43:58 +0000 (11:43 -0800)]
Adding SUPL NI Emergency Extension Time

Configurable by carrier config.xml resource

Bug: 118839234
Bug: 115361555
Bug: 112159033
Test: On device, see b/115361555#comment14
Change-Id: I52e61656cca8b6fa6468d32d2e69bf60f4c83c61
Merged-In: I52e61656cca8b6fa6468d32d2e69bf60f4c83c61

5 years agoAdding SUPL NI Emergency Extension Time
WyattRiley [Thu, 6 Dec 2018 19:43:58 +0000 (11:43 -0800)]
Adding SUPL NI Emergency Extension Time

Configurable by carrier config.xml resource

Bug: 118839234
Bug: 115361555
Bug: 112159033
Test: On device, see b/115361555#comment14
Change-Id: I52e61656cca8b6fa6468d32d2e69bf60f4c83c61
Merged-In: I52e61656cca8b6fa6468d32d2e69bf60f4c83c61

5 years agoFRP: save password quality in DPM.resetPassword
Adrian Roos [Thu, 6 Dec 2018 16:50:41 +0000 (17:50 +0100)]
FRP: save password quality in DPM.resetPassword

When setting a password from DPM.resetPassword(), the actual quality of the
password was not passed to LockSettingsService (instead, the minimum required
quality was passed which is often UNSPECIFIED). As a result, during FRP we
would see inconsistent state and skip it.

Bug: 110172241
Test: Set credential via DPM.resetPassword(), factory reset device to trigger FRP, verify FRP shows.
Change-Id: I54376f60ac53451ace22965d331b47cd8c2e614e
Merged-In: I54376f60ac53451ace22965d331b47cd8c2e614e

5 years agoBluetooth: Check descriptors size in BluetoothHidDeviceAppSdpSettings am: f843ccbf9e
Jakub Pawlowski [Fri, 30 Nov 2018 16:32:04 +0000 (08:32 -0800)]
Bluetooth: Check descriptors size in BluetoothHidDeviceAppSdpSettings am: f843ccbf9e
am: 0712542a6f

Change-Id: Ia2cd4c36a357350f203aa34c42ee0a7711e18a67

5 years agoBluetooth: Check descriptors size in BluetoothHidDeviceAppSdpSettings
Jakub Pawlowski [Fri, 30 Nov 2018 16:22:48 +0000 (08:22 -0800)]
Bluetooth: Check descriptors size in BluetoothHidDeviceAppSdpSettings
am: f843ccbf9e

Change-Id: I73800fa61a09d6a5e603582a0a4046a8bb7fd5d8

5 years agoBluetooth: Check descriptors size in BluetoothHidDeviceAppSdpSettings
Jakub Pawlowski [Thu, 29 Nov 2018 17:54:21 +0000 (18:54 +0100)]
Bluetooth: Check descriptors size in BluetoothHidDeviceAppSdpSettings

Bug: 119819889
Test: compilation
Change-Id: If51d0e2af74d99758f79a603d40cc2f5c84e4dde
Merged-In: If51d0e2af74d99758f79a603d40cc2f5c84e4dde

5 years agoMerge "RESTRICT AUTOMERGE: Added an app id security check in isAppForeground." into...
Varun Shah [Mon, 19 Nov 2018 23:19:59 +0000 (15:19 -0800)]
Merge "RESTRICT AUTOMERGE: Added an app id security check in isAppForeground." into oc-dev am: 546ba589a2
am: 84376cb95a

Change-Id: I096470de6d03ab34591b12bc7172056a1ffe38ed

5 years agoMerge "RESTRICT AUTOMERGE: Added an app id security check in isAppForeground." into...
Varun Shah [Mon, 19 Nov 2018 23:11:59 +0000 (15:11 -0800)]
Merge "RESTRICT AUTOMERGE: Added an app id security check in isAppForeground." into oc-dev
am: 546ba589a2

Change-Id: I0b63c0bef57320b7465c2fe4e45304fd637e712d

5 years agoMerge "RESTRICT AUTOMERGE: Added an app id security check in isAppForeground." into...
TreeHugger Robot [Mon, 19 Nov 2018 22:49:58 +0000 (22:49 +0000)]
Merge "RESTRICT AUTOMERGE: Added an app id security check in isAppForeground." into oc-dev

5 years ago[automerger skipped] [automerger] Select only preinstalled Spell Checker Services...
Guliz Tuncay [Fri, 16 Nov 2018 22:03:29 +0000 (14:03 -0800)]
[automerger skipped] [automerger] Select only preinstalled Spell Checker Services am: fa265ed970 am: c008f3df63 am: 8df481923f am: 6e652225ad am: 6bd38ca2aa am: 608d567e43
am: e5322fa084  -s ours

Change-Id: I42907e9163fc5b58600b2fcd99088f7c49ddbcf0

5 years ago[automerger] Select only preinstalled Spell Checker Services am: fa265ed970 am: c008f...
Guliz Tuncay [Fri, 16 Nov 2018 21:46:12 +0000 (13:46 -0800)]
[automerger] Select only preinstalled Spell Checker Services am: fa265ed970 am: c008f3df63 am: 8df481923f am: 6e652225ad am: 6bd38ca2aa
am: 608d567e43

Change-Id: I5d09ecdb574e347f5f8c8c86a7f6a8ecb26e42c4

5 years ago[automerger] Select only preinstalled Spell Checker Services am: fa265ed970 am: c008f...
Android Build Merger (Role) [Wed, 14 Nov 2018 20:07:40 +0000 (20:07 +0000)]
[automerger] Select only preinstalled Spell Checker Services am: fa265ed970 am: c008f3df63 am: 8df481923f am: 6e652225ad am: 6bd38ca2aa

Change-Id: I63d8639a52f0be081b397e1bb7813d1e7e4b8aa4

5 years ago[automerger] Select only preinstalled Spell Checker Services am: fa265ed970 am: c008f...
Android Build Merger (Role) [Wed, 14 Nov 2018 20:07:32 +0000 (20:07 +0000)]
[automerger] Select only preinstalled Spell Checker Services am: fa265ed970 am: c008f3df63 am: 8df481923f am: 6e652225ad

Change-Id: Iece38d8723b40e22f86f4aa599d42dbf9a2fcbab

5 years ago[automerger] Select only preinstalled Spell Checker Services am: fa265ed970 am: c008f...
Android Build Merger (Role) [Wed, 14 Nov 2018 20:07:25 +0000 (20:07 +0000)]
[automerger] Select only preinstalled Spell Checker Services am: fa265ed970 am: c008f3df63 am: 8df481923f

Change-Id: If661d9f3206b0e9da2a98ffb14b0ff38154cd757

5 years ago[automerger] Select only preinstalled Spell Checker Services am: fa265ed970 am: c008f...
Android Build Merger (Role) [Wed, 14 Nov 2018 20:07:20 +0000 (20:07 +0000)]
[automerger] Select only preinstalled Spell Checker Services am: fa265ed970 am: c008f3df63

Change-Id: I9541ff6206955ed3479d5b4aa6c78f23304d3165

5 years ago[automerger] Select only preinstalled Spell Checker Services am: fa265ed970
Android Build Merger (Role) [Wed, 14 Nov 2018 20:07:12 +0000 (20:07 +0000)]
[automerger] Select only preinstalled Spell Checker Services am: fa265ed970

Change-Id: I6a0825a14c8b0f38415cccacc315ba84eb88f5b9

5 years agoSelect only preinstalled Spell Checker Services
Guliz Tuncay [Wed, 16 Aug 2017 19:02:31 +0000 (12:02 -0700)]
Select only preinstalled Spell Checker Services

When we are setting a new spell checker as the default one in
Secure.Settings, TSMS#findAvailSpellCheckerLocked can pick up
any available spell checker service. This violates the principle
that user should be warned whenever we are setting an untrusted
spell checker service as the default service, since the warning
dialog is never shown.

Fixes: 64764051
Bug: 118694079
Test: Manually as follows:
0. Make sure AOSP keyboard is pre-installed.
1. adb shell settings put --user 0 secure selected_spell_checker com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
2. tapas SampleSpellCheckerService
3. make -j
4. adb install --user 0  -r out/target/product/generic/system/app/SampleSpellCheckerService/SampleSpellCheckerService.apk
5. adb shell pm disable com.android.inputmethod.latin
6. adb shell settings get --user 0 secure selected_spell_checker
    -> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
7. adb reboot
8. adb shell settings get --user 0 secure selected_spell_checker
    -> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
Change-Id: I298ffbcfa5e32f43753f54fbebc40a414a5c0f9e
Merged-In: I298ffbcfa5e32f43753f54fbebc40a414a5c0f9e

5 years agoMerge changes from topic "am-9fd37bbd-f227-4135-a674-78c7ef1f0468" into oc-dev am...
Bill Yi [Sun, 11 Nov 2018 04:12:56 +0000 (20:12 -0800)]
Merge changes from topic "am-9fd37bbd-f227-4135-a674-78c7ef1f0468" into oc-dev am: bc7da75f87
am: 8c06bfb6a4

Change-Id: Ic8f5a84eac8899a07f504c450a549f6d0a6668d0

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f77737395b skipped...
Bill Yi [Sun, 11 Nov 2018 04:06:18 +0000 (20:06 -0800)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f77737395b skipped: 640fb0a793 am: c9590c8fc1  -s ours
am: 0881f3bb25  -s ours

Change-Id: I75c047e0e331d90ff7660f3484ee3d72cdd45cfa

5 years agoMerge changes from topic "am-6c55709f-f895-4072-8c00-5133d079d8d8" into oc-dev am...
Bill Yi [Sun, 11 Nov 2018 03:55:02 +0000 (19:55 -0800)]
Merge changes from topic "am-6c55709f-f895-4072-8c00-5133d079d8d8" into oc-dev am: cff099466e
am: 21060a9e0d

Change-Id: I404b2530e16205e480bcb3524c8d070700b15961

5 years agoMerge changes from topic "am-9fd37bbd-f227-4135-a674-78c7ef1f0468" into oc-dev
Bill Yi [Sun, 11 Nov 2018 03:49:37 +0000 (19:49 -0800)]
Merge changes from topic "am-9fd37bbd-f227-4135-a674-78c7ef1f0468" into oc-dev
am: bc7da75f87

Change-Id: Ibdf168a787a6208e78afce6ee311cfd84b198c4b

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7 skipped...
Bill Yi [Sun, 11 Nov 2018 03:48:37 +0000 (19:48 -0800)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7 skipped: b702eb1807 am: 5e3def3f70  -s ours
am: 599b561ff1  -s ours

Change-Id: I6931f8b42325661d01f6a58c969bb571675038f1

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f77737395b skipped...
Bill Yi [Sun, 11 Nov 2018 03:47:36 +0000 (19:47 -0800)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f77737395b skipped: 640fb0a793
am: c9590c8fc1  -s ours

Change-Id: I8c87d21d8f99ea3a8e9639a56e8acb10712e7366

5 years agoMerge changes from topic "am-6c55709f-f895-4072-8c00-5133d079d8d8" into oc-dev
Bill Yi [Sun, 11 Nov 2018 03:43:45 +0000 (19:43 -0800)]
Merge changes from topic "am-6c55709f-f895-4072-8c00-5133d079d8d8" into oc-dev
am: cff099466e

Change-Id: I173094597612750f9c4645236ddeb972aa5ad7c5

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7 skipped...
Bill Yi [Sun, 11 Nov 2018 03:41:31 +0000 (19:41 -0800)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7 skipped: b702eb1807
am: 5e3def3f70  -s ours

Change-Id: Iab399a5abfc4c27aac2956e4d048ef491bd64a3e

5 years agoMerge changes from topic "am-9fd37bbd-f227-4135-a674-78c7ef1f0468" into oc-dev
TreeHugger Robot [Sun, 11 Nov 2018 03:33:51 +0000 (03:33 +0000)]
Merge changes from topic "am-9fd37bbd-f227-4135-a674-78c7ef1f0468" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: f77737395b skipped: 640fb0a793
  [automerger skipped] Import translations. DO NOT MERGE skipped: f77737395b
  Import translations. DO NOT MERGE

5 years agoMerge changes from topic "am-9fd37bbd-f227-4135-a674-78c7ef1f0468" into nyc-mr2-dev
TreeHugger Robot [Sun, 11 Nov 2018 03:33:51 +0000 (03:33 +0000)]
Merge changes from topic "am-9fd37bbd-f227-4135-a674-78c7ef1f0468" into nyc-mr2-dev

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

5 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sun, 11 Nov 2018 03:33:51 +0000 (03:33 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

5 years agoMerge changes from topic "am-6c55709f-f895-4072-8c00-5133d079d8d8" into oc-dev
TreeHugger Robot [Sun, 11 Nov 2018 03:26:32 +0000 (03:26 +0000)]
Merge changes from topic "am-6c55709f-f895-4072-8c00-5133d079d8d8" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7 skipped: b702eb1807
  [automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7
  Import translations. DO NOT MERGE

5 years agoMerge changes from topic "am-6c55709f-f895-4072-8c00-5133d079d8d8" into nyc-mr2-dev
TreeHugger Robot [Sun, 11 Nov 2018 03:26:32 +0000 (03:26 +0000)]
Merge changes from topic "am-6c55709f-f895-4072-8c00-5133d079d8d8" into nyc-mr2-dev

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

5 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sun, 11 Nov 2018 03:26:32 +0000 (03:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

5 years agoMerge changes from topic "am-8da5d3f1-21c0-4b80-9cbb-748987f515da" into oc-dev am...
Bill Yi [Sun, 11 Nov 2018 02:52:44 +0000 (18:52 -0800)]
Merge changes from topic "am-8da5d3f1-21c0-4b80-9cbb-748987f515da" into oc-dev am: cfbf7a21c3
am: d2eb52dd7b

Change-Id: I81c9ccd2c72f1e7df73c45c7f667c5b8b34b0f81

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30 skipped...
Bill Yi [Sun, 11 Nov 2018 02:46:15 +0000 (18:46 -0800)]
[automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30 skipped: 38e04d8b0a am: 39a2390fb9  -s ours
am: 497cb6d257  -s ours

Change-Id: I023423567ab71703b9411c498ef904010d39f04d

5 years agoMerge changes from topic "am-a4f2313d-91d9-4723-8d15-dc7e5aa52970" into oc-dev am...
Bill Yi [Sun, 11 Nov 2018 02:44:48 +0000 (18:44 -0800)]
Merge changes from topic "am-a4f2313d-91d9-4723-8d15-dc7e5aa52970" into oc-dev am: 8c5514b186
am: fefdff353f

Change-Id: Ib2772d84dc02ef1b3ec12e7347528b7c3d601a5f

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9 skipped...
Bill Yi [Sun, 11 Nov 2018 02:38:08 +0000 (18:38 -0800)]
[automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9 skipped: d9cf1de3e4 am: cbaf1505a0  -s ours
am: 82f5bd65de  -s ours

Change-Id: I36df2a13e12e8050327edc47232a501de40357a3

5 years agoMerge changes from topic "am-707d9054-0085-4add-8cb5-07f6cb10d135" into oc-dev am...
Bill Yi [Sun, 11 Nov 2018 02:20:38 +0000 (18:20 -0800)]
Merge changes from topic "am-707d9054-0085-4add-8cb5-07f6cb10d135" into oc-dev am: 3fa917c8bc
am: 51ec5967af

Change-Id: If8018f95a4a1ce3431d5fd28979056cd5e0f6535

5 years agoMerge changes from topic "am-8da5d3f1-21c0-4b80-9cbb-748987f515da" into oc-dev
Bill Yi [Sun, 11 Nov 2018 02:15:34 +0000 (18:15 -0800)]
Merge changes from topic "am-8da5d3f1-21c0-4b80-9cbb-748987f515da" into oc-dev
am: cfbf7a21c3

Change-Id: I26bdbcd48705c30189d55904823cfd03a0fd11dc

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69 skipped...
Bill Yi [Sun, 11 Nov 2018 02:13:08 +0000 (18:13 -0800)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69 skipped: 79dc3a3343 am: 204f727404  -s ours
am: 519fa54629  -s ours

Change-Id: I993fdf5434f660d1b91925fd85241b2b49e4fc39

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30 skipped...
Bill Yi [Sun, 11 Nov 2018 02:13:06 +0000 (18:13 -0800)]
[automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30 skipped: 38e04d8b0a
am: 39a2390fb9  -s ours

Change-Id: I7ce95669411440d93e113c1f6facd374a9c36241

5 years agoMerge changes from topic "am-e8cf3957-7e41-48c5-b339-2114401da749" into oc-dev am...
Bill Yi [Sun, 11 Nov 2018 02:11:36 +0000 (18:11 -0800)]
Merge changes from topic "am-e8cf3957-7e41-48c5-b339-2114401da749" into oc-dev am: 568344a776
am: 8b1df08930

Change-Id: I9702562624983fc18ffccb5f3b40da55f0f0bb0b

5 years agoMerge changes from topic "am-a4f2313d-91d9-4723-8d15-dc7e5aa52970" into oc-dev
Bill Yi [Sun, 11 Nov 2018 02:07:06 +0000 (18:07 -0800)]
Merge changes from topic "am-a4f2313d-91d9-4723-8d15-dc7e5aa52970" into oc-dev
am: 8c5514b186

Change-Id: I20cb7234b5b7a48b57af23b71311989978503de9

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9 skipped...
Bill Yi [Sun, 11 Nov 2018 02:04:59 +0000 (18:04 -0800)]
[automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9 skipped: d9cf1de3e4
am: cbaf1505a0  -s ours

Change-Id: I362c59a89efba73b45a9a5d81474cac8448c2f84

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed skipped...
Bill Yi [Sun, 11 Nov 2018 02:04:52 +0000 (18:04 -0800)]
[automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed skipped: 985e4a2c7f am: 176758a8cb  -s ours
am: 1da1b80a9f  -s ours

Change-Id: I51dd2717412247842355cfab15242e7b26d8e0ac

5 years agoMerge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into oc-dev am...
Bill Yi [Sun, 11 Nov 2018 02:01:59 +0000 (18:01 -0800)]
Merge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into oc-dev am: ef0d8b4472
am: d72f7d1d9e

Change-Id: Id74e8948cfb2e7bb2cd94bbb7e7b87315f3b4332

5 years agoMerge changes from topic "am-707d9054-0085-4add-8cb5-07f6cb10d135" into oc-dev
Bill Yi [Sun, 11 Nov 2018 02:01:06 +0000 (18:01 -0800)]
Merge changes from topic "am-707d9054-0085-4add-8cb5-07f6cb10d135" into oc-dev
am: 3fa917c8bc

Change-Id: I9b83367bb794f295c81ccfaf7c9ac1f2113c72e4

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69 skipped...
Bill Yi [Sun, 11 Nov 2018 01:59:03 +0000 (17:59 -0800)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69 skipped: 79dc3a3343
am: 204f727404  -s ours

Change-Id: I3830beca2052ed387304bcdb546aa431627dae1f

5 years agoMerge changes from topic "am-e8cf3957-7e41-48c5-b339-2114401da749" into oc-dev
Bill Yi [Sun, 11 Nov 2018 01:54:56 +0000 (17:54 -0800)]
Merge changes from topic "am-e8cf3957-7e41-48c5-b339-2114401da749" into oc-dev
am: 568344a776

Change-Id: If9f7d923e98f33d346ede4bfe3be622f3742ee90

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped...
Bill Yi [Sun, 11 Nov 2018 01:54:44 +0000 (17:54 -0800)]
[automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0 am: 236da59677  -s ours
am: 94c6fa964f  -s ours

Change-Id: Iee603d93a2a105600195663aa7101312f9e6bcc7

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed skipped...
Bill Yi [Sun, 11 Nov 2018 01:52:40 +0000 (17:52 -0800)]
[automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed skipped: 985e4a2c7f
am: 176758a8cb  -s ours

Change-Id: I83944a6a1e013ba6c0a675637e102949115b4ba0

5 years agoMerge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into oc-dev
Bill Yi [Sun, 11 Nov 2018 01:49:06 +0000 (17:49 -0800)]
Merge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into oc-dev
am: ef0d8b4472

Change-Id: Ie4cdce55a83a00f2ceac184cbc858b7fa4deddcb

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped...
Bill Yi [Sun, 11 Nov 2018 01:46:47 +0000 (17:46 -0800)]
[automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0
am: 236da59677  -s ours

Change-Id: I8f2cce17bfcec29b146a46343cded42d1afd99de

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2 skipped...
Bill Yi [Sun, 11 Nov 2018 01:44:42 +0000 (17:44 -0800)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2 skipped: 7176023903 am: 09f4f73afa  -s ours
am: 5c7f0c40fb  -s ours

Change-Id: Id8896ffc8ac52ac571ce856d657b928b6e385d74

5 years agoMerge changes from topic "am-8da5d3f1-21c0-4b80-9cbb-748987f515da" into oc-dev
TreeHugger Robot [Sun, 11 Nov 2018 01:38:13 +0000 (01:38 +0000)]
Merge changes from topic "am-8da5d3f1-21c0-4b80-9cbb-748987f515da" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30 skipped: 38e04d8b0a
  [automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30
  Import translations. DO NOT MERGE

5 years agoMerge changes from topic "am-8da5d3f1-21c0-4b80-9cbb-748987f515da" into nyc-mr2-dev
TreeHugger Robot [Sun, 11 Nov 2018 01:38:13 +0000 (01:38 +0000)]
Merge changes from topic "am-8da5d3f1-21c0-4b80-9cbb-748987f515da" into nyc-mr2-dev

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

5 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sun, 11 Nov 2018 01:38:13 +0000 (01:38 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2 skipped...
Bill Yi [Sun, 11 Nov 2018 01:35:57 +0000 (17:35 -0800)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2 skipped: 7176023903
am: 09f4f73afa  -s ours

Change-Id: Ib2b40d7dd3601e97353a63718bfbc44e5c967ee4

5 years agoMerge changes from topic "am-a4f2313d-91d9-4723-8d15-dc7e5aa52970" into oc-dev
TreeHugger Robot [Sun, 11 Nov 2018 01:31:19 +0000 (01:31 +0000)]
Merge changes from topic "am-a4f2313d-91d9-4723-8d15-dc7e5aa52970" into oc-dev

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

5 years agoMerge changes from topic "am-a4f2313d-91d9-4723-8d15-dc7e5aa52970" into nyc-mr2-dev
TreeHugger Robot [Sun, 11 Nov 2018 01:31:19 +0000 (01:31 +0000)]
Merge changes from topic "am-a4f2313d-91d9-4723-8d15-dc7e5aa52970" into nyc-mr2-dev

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

5 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sun, 11 Nov 2018 01:31:19 +0000 (01:31 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

5 years agoMerge changes from topic "am-707d9054-0085-4add-8cb5-07f6cb10d135" into oc-dev
TreeHugger Robot [Sun, 11 Nov 2018 01:31:00 +0000 (01:31 +0000)]
Merge changes from topic "am-707d9054-0085-4add-8cb5-07f6cb10d135" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69 skipped: 79dc3a3343
  [automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69
  Import translations. DO NOT MERGE

5 years agoMerge changes from topic "am-707d9054-0085-4add-8cb5-07f6cb10d135" into nyc-mr2-dev
TreeHugger Robot [Sun, 11 Nov 2018 01:31:00 +0000 (01:31 +0000)]
Merge changes from topic "am-707d9054-0085-4add-8cb5-07f6cb10d135" into nyc-mr2-dev

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

5 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sun, 11 Nov 2018 01:31:00 +0000 (01:31 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

5 years agoMerge changes from topic "am-e8cf3957-7e41-48c5-b339-2114401da749" into oc-dev
TreeHugger Robot [Sun, 11 Nov 2018 01:30:11 +0000 (01:30 +0000)]
Merge changes from topic "am-e8cf3957-7e41-48c5-b339-2114401da749" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed skipped: 985e4a2c7f
  [automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed
  Import translations. DO NOT MERGE

5 years agoMerge changes from topic "am-e8cf3957-7e41-48c5-b339-2114401da749" into nyc-mr2-dev
TreeHugger Robot [Sun, 11 Nov 2018 01:30:11 +0000 (01:30 +0000)]
Merge changes from topic "am-e8cf3957-7e41-48c5-b339-2114401da749" into nyc-mr2-dev

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

5 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sun, 11 Nov 2018 01:30:11 +0000 (01:30 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

5 years agoMerge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into oc-dev
TreeHugger Robot [Sun, 11 Nov 2018 01:27:55 +0000 (01:27 +0000)]
Merge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0
  [automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57
  Import translations. DO NOT MERGE

5 years agoMerge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into nyc-mr2-dev
TreeHugger Robot [Sun, 11 Nov 2018 01:27:55 +0000 (01:27 +0000)]
Merge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into nyc-mr2-dev

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

5 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sun, 11 Nov 2018 01:27:55 +0000 (01:27 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed skipped...
Android Build Merger (Role) [Sat, 10 Nov 2018 19:47:15 +0000 (19:47 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed skipped: 985e4a2c7f

Change-Id: I63583ee2589e27644de2fe138fde88d1efd7c4f6

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed
Android Build Merger (Role) [Sat, 10 Nov 2018 19:47:09 +0000 (19:47 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed

Change-Id: I58f6aae098f5dcb6c8ecfcaef6427f5276d36324

5 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 10 Nov 2018 19:46:51 +0000 (11:46 -0800)]
Import translations. DO NOT MERGE

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

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2 skipped...
Android Build Merger (Role) [Sat, 10 Nov 2018 19:40:53 +0000 (19:40 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2 skipped: 7176023903

Change-Id: I80379f2416b5f60734fce3db6b8d74ceca628331

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2
Android Build Merger (Role) [Sat, 10 Nov 2018 19:40:44 +0000 (19:40 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2

Change-Id: I17330d6b3d4cf62d89a3413605ceae1b701bb858

5 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 10 Nov 2018 19:40:18 +0000 (11:40 -0800)]
Import translations. DO NOT MERGE

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

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9 skipped...
Android Build Merger (Role) [Sat, 10 Nov 2018 18:50:19 +0000 (18:50 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9 skipped: d9cf1de3e4

Change-Id: I2bb4251fa00c257d00e4cefa4ddca89fc24ad7f3

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9
Android Build Merger (Role) [Sat, 10 Nov 2018 18:50:11 +0000 (18:50 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9

Change-Id: Id0e2056ac5c7ef52d8d2f844bb3ff5c660e27959

5 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 10 Nov 2018 18:49:42 +0000 (10:49 -0800)]
Import translations. DO NOT MERGE

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

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped...
Android Build Merger (Role) [Sat, 10 Nov 2018 18:43:44 +0000 (18:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0

Change-Id: I71ed720b5ec39dc9be62aa13d71f5d06f3bec0e3

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57
Android Build Merger (Role) [Sat, 10 Nov 2018 18:43:37 +0000 (18:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57

Change-Id: I997246032f47b236724ae93f3fe4e0ba34053d66

5 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 10 Nov 2018 18:43:10 +0000 (10:43 -0800)]
Import translations. DO NOT MERGE

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

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30 skipped...
Android Build Merger (Role) [Sat, 10 Nov 2018 18:31:16 +0000 (18:31 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30 skipped: 38e04d8b0a

Change-Id: I717bb8adc24725ee2c219bb322520ec4d6ff3256

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30
Android Build Merger (Role) [Sat, 10 Nov 2018 18:31:06 +0000 (18:31 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30

Change-Id: I098638c4895f56981058a6d7e3cd08dd47d6c3d6

5 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 10 Nov 2018 18:30:20 +0000 (10:30 -0800)]
Import translations. DO NOT MERGE

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

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f77737395b skipped...
Android Build Merger (Role) [Sat, 10 Nov 2018 18:01:54 +0000 (18:01 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f77737395b skipped: 640fb0a793

Change-Id: I596b914378d3cf86fb5d93c515c5ff47176d636f

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f77737395b
Android Build Merger (Role) [Sat, 10 Nov 2018 18:01:47 +0000 (18:01 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f77737395b

Change-Id: Ie294af994de6deefe985c3af3695a2ed7097928e

5 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 10 Nov 2018 18:01:28 +0000 (10:01 -0800)]
Import translations. DO NOT MERGE

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

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7 skipped...
Android Build Merger (Role) [Sat, 10 Nov 2018 17:38:36 +0000 (17:38 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7 skipped: b702eb1807

Change-Id: Ib778cb2efec1d341648d54bd38a0c215bb7fbc18

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7
Android Build Merger (Role) [Sat, 10 Nov 2018 17:38:30 +0000 (17:38 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7

Change-Id: I7f4920d65b03f1bc7e4b398e9391560cc36a4d1a

5 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 10 Nov 2018 17:38:06 +0000 (09:38 -0800)]
Import translations. DO NOT MERGE

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

5 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69 skipped...
Android Build Merger (Role) [Sat, 10 Nov 2018 17:31:53 +0000 (17:31 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69 skipped: 79dc3a3343

Change-Id: If19056c1c2ed311693bd74ee5514fa789f5a1faa