OSDN Git Service
Shaotang Li [Thu, 19 Jul 2018 09:29:39 +0000 (17:29 +0800)]
Add new telecom metrics for emergency dialer
These includes,
1. The source where user initiated the call.
2. The duration between START_CONNECTION and REQUEST_DISCONNECT.
Bug:
112168722
Bug:
111818008
Test: manual and check the result of
'adb shell dumpsys telecom' for metrics data
Change-Id: Iddc7f256362abe9fe252bd12cead05a7d77d329e
Merged-In: Iddc7f256362abe9fe252bd12cead05a7d77d329e
Shaotang Li [Wed, 4 Jul 2018 06:03:25 +0000 (14:03 +0800)]
Add new metrics constants for emergency dialer
Bug:
112168722
Bug:
111378820
Test: build
Change-Id: I2eb6965238e37435bb380fb4a0e616bd1da6dae6
Merged-In: I2eb6965238e37435bb380fb4a0e616bd1da6dae6
Wesley.CW Wang [Fri, 6 Jul 2018 07:26:21 +0000 (15:26 +0800)]
Separated emergency option final UI
- Refine faster emergency icon.
- Add ic_faster_emergency.xml to framework/core/res/drawable.
- Remove faster_emergency_icon.xml from SystemUI/res/drawable.
- Change emergency_icon.xml color to colorError.
- Emergency option(India case) will follow separated option design if
separated option feature is enabled.
Test: Manually,
use "adb shell settings put global faster_emergency_phone_call_enabled 1" to show separated emergency option(default case),
use "adb shell settings put global emergency_affordance_needed 1" to show India emergency option(India case),
India emergency option will be separated button if feature is enabled,
otherwise it will be default design.
Change wallpaper to enable light/dark theme & check separated emergency option color.
(light theme color : D93025 dark theme color : E25142)
Bug:
112168722
Bug:
110658988
Change-Id: I2a3c5ce053aab05381806eedf108cec54af808b1
Merged-In: Id13bcb5b5242ded92b309667c5e2beb8694b9977
Merged-In: I2a3c5ce053aab05381806eedf108cec54af808b1
Wesley.CW Wang [Wed, 4 Jul 2018 09:35:00 +0000 (17:35 +0800)]
Fix Power menu background vanish
- Separated button & origin button use same HardwareBgDrawable caused
power menu background vanish when keyboard showing.
- Let separated button use mSeparatedViewBackground & origin button use
mListBackground to fix this bug.
- Rename View mChild to mList.
Test: Manually, long press power key to launch power menu when keyboard
showing, power menu background should display normally.
Bug:
112168722
Bug:
111101759
Change-Id: I7122ff52fd14021ac01b1ab9d64e7dde71fa7ab1
Merged-In: Ic08cabc63daebc4001c8eda751857d11cb0e6352
Merged-In: I7122ff52fd14021ac01b1ab9d64e7dde71fa7ab1
Wesley.CW Wang [Fri, 15 Jun 2018 08:24:57 +0000 (16:24 +0800)]
Add separated emergency option on power menu
- Add a separated button on power menu to launch emergency dialer.
- Change HardwareUiLayout.java FrameLayout to LinearLayout, let it can
display separated button.
- Add a flag to recognize separated button should show/hide, if
EmergencyAffordance(India) enabled, separated button will hide,
otherwise power menu will display separated button & power
menu last item won't get white background.
Test: Manually, use "adb shell settings put global faster_emergency_phone_call_enabled 1" to show/hide separated emergency option, press emergency option will go to emergency dialer.
Change-Id: I1140fa412b655c16f3052cbabd118df278fd7f23
Merged-In: I8e6bb72ce7b8cecdb6bd01150b53f61f1515dbb1
Merged-In: I1140fa412b655c16f3052cbabd118df278fd7f23
Bug:
112168722
Bug:
80376488
Wesley.CW Wang [Mon, 28 May 2018 08:39:27 +0000 (16:39 +0800)]
Add emergency dialer option on power menu
Add a button on power menu to launch emergency dialer.
Add FASTER_EMERGENCY_PHONE_CALL_ENABLED to SettingsBackupTest blacklist.
Test: Manually
Bug:
112168722
Bug:
80376488
Change-Id: If359662a4d60dbe0ded89c3afe35db91dca4c445
Merged-In: I9c920e31433c0ac23165f917d8dd2befaaa4938d
Merged-In: If359662a4d60dbe0ded89c3afe35db91dca4c445
TreeHugger Robot [Wed, 3 Oct 2018 02:38:13 +0000 (02:38 +0000)]
Merge "docs: bug
37070633, wrong method name" into pi-dev
kopriva [Tue, 2 Oct 2018 23:02:39 +0000 (16:02 -0700)]
docs: bug
37070633, wrong method name
Test: make ds-docs
Bug:
37070633
Change-Id: I0e95ce9ac14f00395ddcd0c74bf450ff77178255
Exempt-From-Owner-Approval: Docs-only change
TreeHugger Robot [Tue, 2 Oct 2018 21:17:21 +0000 (21:17 +0000)]
Merge "docs: fixing a couple of typos" into pi-dev
TreeHugger Robot [Tue, 2 Oct 2018 21:13:28 +0000 (21:13 +0000)]
Merge "docs: fixing typo, bug
37006473" into pi-dev
TreeHugger Robot [Tue, 2 Oct 2018 20:30:17 +0000 (20:30 +0000)]
Merge "Fix Connect State message in Device details for Hearing Aids" into pi-dev
kopriva [Tue, 2 Oct 2018 19:46:55 +0000 (12:46 -0700)]
docs: fixing typo, bug
37006473
also fixing an import statement that was blocking upload at repo hooks:
removed unused SystemApi import
Test: make ds-docs
Bug:
37006473
Change-Id: I2dec10fad213c4822631ad0f9c518a89d6c0c384
Exempt-From-Owner-Approval: Docs-only change
Todd Kopriva [Tue, 2 Oct 2018 19:03:29 +0000 (19:03 +0000)]
Merge "docs: bug
37130805, typo" into pi-dev
Stanley Tng [Mon, 1 Oct 2018 05:43:06 +0000 (22:43 -0700)]
Fix Connect State message in Device details for Hearing Aids
In the Device details of Settings App and when using two Hearing Aids
devices (left and right sides), this will fix the connect state messages
for these two devices. Also added Robo tests for the changes.
Bug:
116317072
Bug:
117074814
Test: Manual tests and also ran RunSettingsLibRoboTests and RunSettingsRoboTests.
Change-Id: Ia9df6facd99ae91ebb4a819f61ea27551ce35efe
Merged-In: Id2dc364dfa815e72db91b92bcee9745e6c40d34a
Merged-In: Ia9df6facd99ae91ebb4a819f61ea27551ce35efe
(cherry picked from commit
3d8dd1ae2c5b7aad91594062e53ef3bc2db7212e)
TreeHugger Robot [Tue, 2 Oct 2018 11:49:11 +0000 (11:49 +0000)]
Merge "Go via FgThread when starting the profiles during system boot." into pi-dev
TreeHugger Robot [Tue, 2 Oct 2018 00:53:40 +0000 (00:53 +0000)]
Merge changes from topic "hearing-aid" into pi-dev
* changes:
Fix missing connection state changes intent for Hearing Aids
Add Feature Flag for Hearing Aid Profile
Prevent NPE when profile is null
Add isConnectedHearingAidDevice function to check if it supports Hearing Aid profile
kopriva [Mon, 1 Oct 2018 22:54:49 +0000 (15:54 -0700)]
docs: fixing a couple of typos
Test: make ds-docs
Bug:
37130920
Change-Id: Ic3d861624be12fd7967080a09a3f82d941d7e915
Exempt-From-Owner-Approval: Docs-only change
Brad Ebinger [Mon, 1 Oct 2018 22:36:06 +0000 (22:36 +0000)]
Merge "Only make a subset of Call Barring options visible per carrier" into pi-dev
TreeHugger Robot [Mon, 1 Oct 2018 22:02:28 +0000 (22:02 +0000)]
Merge changes from topic "language_filtering" into pi-dev
* changes:
Use locale language instead of harcoded langauge
Added new cell broadcast channels
kopriva [Sat, 29 Sep 2018 19:32:37 +0000 (12:32 -0700)]
docs: bug
37130805, typo
I fixed an extra 'and' while I was at it.
Test: make ds-docs
Bug:
37130805
Change-Id: Ia1e9a991f824253feca628022414f2e1fbdcfea8
Exempt-From-Owner-Approval: Docs-only change
Stanley Tng [Wed, 26 Sep 2018 01:07:41 +0000 (18:07 -0700)]
Fix missing connection state changes intent for Hearing Aids
In some corner cases, the intent receiver for hearing aids CONNECTION_STATE_CHANGED
is not registered. This fixes this problem. We need to check hearing aid
profile before updateLocalProfile().
Note: This has been totally fixed in master in refactoring code.
Bug:
116317072
Bug:
116044083
Bug:
116643085
Test: Manual tests with one Hearing Aid device and in Settings-Device
details page.
Change-Id: I20bf6b9fe929cd8753a20b8112e66467e560f6df
Merged-In: Id2dc364dfa815e72db91b92bcee9745e6c40d34a
TreeHugger Robot [Mon, 1 Oct 2018 19:58:30 +0000 (19:58 +0000)]
Merge "DO NOT MERGE Notifs sent from suspended apps should reappear" into pi-dev
TreeHugger Robot [Mon, 1 Oct 2018 18:18:46 +0000 (18:18 +0000)]
Merge "docs: bug
72853855, wrong parameter" into pi-dev
TreeHugger Robot [Mon, 1 Oct 2018 18:16:22 +0000 (18:16 +0000)]
Merge "docs: bug
72929620, nonoteslas typo" into pi-dev
TreeHugger Robot [Mon, 1 Oct 2018 18:16:16 +0000 (18:16 +0000)]
Merge "docs: bug
112769174, unclosed parentheses" into pi-dev
TreeHugger Robot [Mon, 1 Oct 2018 18:15:42 +0000 (18:15 +0000)]
Merge "docs: fixed broken link" into pi-dev
TreeHugger Robot [Mon, 1 Oct 2018 18:13:00 +0000 (18:13 +0000)]
Merge "docs: bug
37113731, correcting flag name" into pi-dev
Bill Yi [Mon, 1 Oct 2018 09:48:19 +0000 (02:48 -0700)]
Merge changes from topic "am-
59fcdedb-d1d8-4894-bcee-
75f4085aa930" into oc-dev am:
57b2e38837 am:
6c2376ce80
am:
a526511c79
Change-Id: Iddef019195dcf571656b68e00dd245b2db6cb812
Bill Yi [Mon, 1 Oct 2018 09:40:39 +0000 (02:40 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4b2cb1520 skipped:
853c7ca3a5 am:
0bc949205b -s ours am:
318224ae93 -s ours
am:
9577eeb9dc -s ours
Change-Id: Ic9250b99ba5f09e3fc6a4e7f7792ae223e866cea
Bill Yi [Mon, 1 Oct 2018 08:45:58 +0000 (01:45 -0700)]
Merge changes from topic "am-
51a4d236-f631-4fe1-9fa8-
50a6c5132ce4" into oc-dev am:
33be0d800a am:
e90b1d120c
am:
06908ed009
Change-Id: Ia9f82bf142fb7e168da1c14807e8d6b85bd13f32
Bill Yi [Mon, 1 Oct 2018 08:37:48 +0000 (01:37 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
73a5116af8 skipped:
b5f88962d5 am:
fd474f8dc8 -s ours am:
3cd4a34364 -s ours
am:
def9e59830 -s ours
Change-Id: Idfd769b887d9e65c41157793431a575c2eac2443
Bill Yi [Mon, 1 Oct 2018 08:36:22 +0000 (01:36 -0700)]
Merge changes from topic "am-
95ed1a42-c734-497b-9e03-
f8de9f42ea61" into oc-dev am:
eb92e99a06 am:
9a953b1022
am:
099172c463
Change-Id: I53a031d168c65894bd94d1adfcdfaf97b3617921
Bill Yi [Mon, 1 Oct 2018 08:28:20 +0000 (01:28 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4310d4d905 skipped:
ebf64faa28 am:
5bf6376615 -s ours am:
f7ee9f3f79 -s ours
am:
1046cb21e2 -s ours
Change-Id: Ibadc2c2efdb2d4eb9176900a62a6fd534d52a22a
Bill Yi [Mon, 1 Oct 2018 08:26:53 +0000 (01:26 -0700)]
Merge changes from topic "am-
25c8f1dd-79b2-410a-8aa9-
2fe914e32aa3" into oc-dev am:
1825d87bc7 am:
c270ca1086
am:
1eaac3c4bf
Change-Id: I5c06fc9693a898e3573d5ac751434bf558cc84a0
Bill Yi [Mon, 1 Oct 2018 08:22:49 +0000 (01:22 -0700)]
Merge changes from topic "am-
59fcdedb-d1d8-4894-bcee-
75f4085aa930" into oc-dev am:
57b2e38837
am:
6c2376ce80
Change-Id: I98b7dd583ff252187b364c2e074493374e7392b4
Bill Yi [Mon, 1 Oct 2018 08:18:26 +0000 (01:18 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f40a0a8dae skipped:
110074be1a am:
77b862002b -s ours am:
4c4783d520 -s ours
am:
2fa324458d -s ours
Change-Id: I1e5011ceb6feab32a09adfcea471ad6341c21139
Bill Yi [Mon, 1 Oct 2018 08:15:57 +0000 (01:15 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4b2cb1520 skipped:
853c7ca3a5 am:
0bc949205b -s ours
am:
318224ae93 -s ours
Change-Id: I67d3e80dfe295f37c8ea3184b4e596fe6a12906c
Bill Yi [Mon, 1 Oct 2018 07:55:45 +0000 (00:55 -0700)]
Merge changes from topic "am-
4f2d7404-9a6c-4f5f-9d17-
25f79c4505ff" into oc-dev am:
8c53c6e4e3 am:
a7bdac8d93
am:
450459bda9
Change-Id: I640c88f6f02335eb0527756ff102f223920003cf
Bill Yi [Mon, 1 Oct 2018 07:53:17 +0000 (00:53 -0700)]
Merge changes from topic "am-
51a4d236-f631-4fe1-9fa8-
50a6c5132ce4" into oc-dev am:
33be0d800a
am:
e90b1d120c
Change-Id: If426bf2027c4630fcf7673752e324ab8bbceac55
Bill Yi [Mon, 1 Oct 2018 07:47:42 +0000 (00:47 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f6e12d6972 skipped:
f487edc7f2 am:
2053a11236 -s ours am:
ed50f647f7 -s ours
am:
b0720ae3c0 -s ours
Change-Id: Ibb60f477d5e4338807999cd42bfe87e0dfd6c95d
Bill Yi [Mon, 1 Oct 2018 07:46:33 +0000 (00:46 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
73a5116af8 skipped:
b5f88962d5 am:
fd474f8dc8 -s ours
am:
3cd4a34364 -s ours
Change-Id: Id93ee3143a8521e2a2e6fb8a7332ed8d5489f4db
Bill Yi [Mon, 1 Oct 2018 07:37:17 +0000 (00:37 -0700)]
Merge changes from topic "am-
95ed1a42-c734-497b-9e03-
f8de9f42ea61" into oc-dev am:
eb92e99a06
am:
9a953b1022
Change-Id: I116451ccc4ff207c70981a234eeb476be6065e88
Bill Yi [Mon, 1 Oct 2018 07:30:38 +0000 (00:30 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4310d4d905 skipped:
ebf64faa28 am:
5bf6376615 -s ours
am:
f7ee9f3f79 -s ours
Change-Id: I283f5e84bfb8ecfcc7e090c2b775935c0f3204ed
Bill Yi [Mon, 1 Oct 2018 07:29:11 +0000 (00:29 -0700)]
Merge changes from topic "am-
25c8f1dd-79b2-410a-8aa9-
2fe914e32aa3" into oc-dev am:
1825d87bc7
am:
c270ca1086
Change-Id: I6787b8eb99e9384e9a207d4f64159c5ac60ce534
Bill Yi [Mon, 1 Oct 2018 07:22:30 +0000 (00:22 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f40a0a8dae skipped:
110074be1a am:
77b862002b -s ours
am:
4c4783d520 -s ours
Change-Id: Iedf2cfa122c27e68007cbeb10a07a5f8d98ecc31
Bill Yi [Mon, 1 Oct 2018 07:21:08 +0000 (00:21 -0700)]
Merge changes from topic "am-
4f2d7404-9a6c-4f5f-9d17-
25f79c4505ff" into oc-dev am:
8c53c6e4e3
am:
a7bdac8d93
Change-Id: Ibd410c3b1fae093a6f946e92ef52de245b52b2f0
Bill Yi [Mon, 1 Oct 2018 07:14:14 +0000 (00:14 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f6e12d6972 skipped:
f487edc7f2 am:
2053a11236 -s ours
am:
ed50f647f7 -s ours
Change-Id: I10472e29a5d41543e9bf5ad1fe56e3facc79ad48
Bill Yi [Mon, 1 Oct 2018 06:54:13 +0000 (23:54 -0700)]
Merge changes from topic "am-
2e7b32c3-6d04-46ba-bfdc-
309eff7d76b0" into oc-dev am:
d349bd741d am:
cf751f2189
am:
dc3d2a5db0
Change-Id: I5462a5f019cef0d1b4cc11657633ef4f78034f6c
Bill Yi [Mon, 1 Oct 2018 06:47:20 +0000 (23:47 -0700)]
Merge changes from topic "am-
59fcdedb-d1d8-4894-bcee-
75f4085aa930" into oc-dev
am:
57b2e38837
Change-Id: Ia168d6b5a5dba2c768c62de8548400b6937c1692
Bill Yi [Mon, 1 Oct 2018 06:46:00 +0000 (23:46 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
b19a62bcf8 skipped:
5883bd3177 am:
1e00122904 -s ours am:
8efa418123 -s ours
am:
3e8f4b1f59 -s ours
Change-Id: Ia7da5db7838f04b8cee2375de5abb85db9949c55
Bill Yi [Mon, 1 Oct 2018 06:44:52 +0000 (23:44 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4b2cb1520 skipped:
853c7ca3a5
am:
0bc949205b -s ours
Change-Id: Ib37e4ec5fc6764341a51a9153842c2080b001b69
Bill Yi [Mon, 1 Oct 2018 06:44:05 +0000 (23:44 -0700)]
Merge changes from topic "am-
8e0e30ce-6e2e-43b5-a842-
3581d218043b" into oc-dev am:
0adf6e1981 am:
6b2064e5c6
am:
36e63c9337
Change-Id: I81c31c5a0be3159514de39492c267c5276cce9f0
Bill Yi [Mon, 1 Oct 2018 06:40:04 +0000 (23:40 -0700)]
Merge changes from topic "am-
51a4d236-f631-4fe1-9fa8-
50a6c5132ce4" into oc-dev
am:
33be0d800a
Change-Id: I589409d6a34ed7091fa182fad4a9d86f65970b38
Bill Yi [Mon, 1 Oct 2018 06:37:34 +0000 (23:37 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
73a5116af8 skipped:
b5f88962d5
am:
fd474f8dc8 -s ours
Change-Id: I81cfcdf20b7c53f16b50d217d231713589c31a5e
Bill Yi [Mon, 1 Oct 2018 06:35:54 +0000 (23:35 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5587649e8f skipped:
07dfa0baae am:
997014d63a -s ours am:
b551c79453 -s ours
am:
fb6c9eb5cf -s ours
Change-Id: I2bc9a5c7b29a9d32100feea93f275afe0dd4f8b2
Bill Yi [Mon, 1 Oct 2018 06:33:47 +0000 (23:33 -0700)]
Merge changes from topic "am-
2e7b32c3-6d04-46ba-bfdc-
309eff7d76b0" into oc-dev am:
d349bd741d
am:
cf751f2189
Change-Id: Iddbea79cb8031d5c0eb5933a1b11902dde12c606
Bill Yi [Mon, 1 Oct 2018 06:32:35 +0000 (23:32 -0700)]
Merge changes from topic "am-
95ed1a42-c734-497b-9e03-
f8de9f42ea61" into oc-dev
am:
eb92e99a06
Change-Id: I770dac967bc946a9c89550989057bb99f8a213fd
Bill Yi [Mon, 1 Oct 2018 06:30:12 +0000 (23:30 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4310d4d905 skipped:
ebf64faa28
am:
5bf6376615 -s ours
Change-Id: Ica580645d38649c5210ddbe0b88bd3516275db13
Bill Yi [Mon, 1 Oct 2018 06:27:11 +0000 (23:27 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
b19a62bcf8 skipped:
5883bd3177 am:
1e00122904 -s ours
am:
8efa418123 -s ours
Change-Id: Ib1ad672df16a3c98e26d73b1e5245fdabed21412
Bill Yi [Mon, 1 Oct 2018 06:25:30 +0000 (23:25 -0700)]
Merge changes from topic "am-
25c8f1dd-79b2-410a-8aa9-
2fe914e32aa3" into oc-dev
am:
1825d87bc7
Change-Id: Ifff670d53d6cbfddac8756f1f7f1352a77528036
Bill Yi [Mon, 1 Oct 2018 06:25:13 +0000 (23:25 -0700)]
Merge changes from topic "am-
8e0e30ce-6e2e-43b5-a842-
3581d218043b" into oc-dev am:
0adf6e1981
am:
6b2064e5c6
Change-Id: I113fecfa795bb3921c8187f2ad0032a679bc74ee
Bill Yi [Mon, 1 Oct 2018 06:23:08 +0000 (23:23 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f40a0a8dae skipped:
110074be1a
am:
77b862002b -s ours
Change-Id: I58dd736fc460e04f8e56b330640681c4e7e5aafc
Bill Yi [Mon, 1 Oct 2018 06:20:49 +0000 (23:20 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
6105ad5932 skipped:
e50fc63e3d am:
20ce1f4c33 -s ours am:
2e250a6542 -s ours
am:
1ac05dfa4a -s ours
Change-Id: Ibcae61eb77aba125de97dfe65f78725bc5dd0a1c
Bill Yi [Mon, 1 Oct 2018 06:18:39 +0000 (23:18 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5587649e8f skipped:
07dfa0baae am:
997014d63a -s ours
am:
b551c79453 -s ours
Change-Id: Ib3a3027b157fb3e6c3c9a7c5cc2ea3aedd35f657
Bill Yi [Mon, 1 Oct 2018 06:17:51 +0000 (23:17 -0700)]
Merge changes from topic "am-
4f2d7404-9a6c-4f5f-9d17-
25f79c4505ff" into oc-dev
am:
8c53c6e4e3
Change-Id: I64b06a863a95707eb9d5ef1db4cd5f5b2c70000b
Bill Yi [Mon, 1 Oct 2018 06:15:15 +0000 (23:15 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f6e12d6972 skipped:
f487edc7f2
am:
2053a11236 -s ours
Change-Id: If63e80c1cbdfa7b56d8c6f5d902b990686daf2be
Bill Yi [Mon, 1 Oct 2018 06:11:05 +0000 (23:11 -0700)]
Merge changes from topic "am-
2e7b32c3-6d04-46ba-bfdc-
309eff7d76b0" into oc-dev
am:
d349bd741d
Change-Id: If41945b25a473afa1c870e294a4b42e856e5c42c
Bill Yi [Mon, 1 Oct 2018 06:09:36 +0000 (23:09 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
6105ad5932 skipped:
e50fc63e3d am:
20ce1f4c33 -s ours
am:
2e250a6542 -s ours
Change-Id: Iccf5a3a42fb7813e3cf90921150fc6357fe058f0
Bill Yi [Mon, 1 Oct 2018 06:08:41 +0000 (23:08 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
b19a62bcf8 skipped:
5883bd3177
am:
1e00122904 -s ours
Change-Id: I5efbcb9878eff1c5df234fdafc8fec126dbf95ca
Bill Yi [Mon, 1 Oct 2018 06:04:11 +0000 (23:04 -0700)]
Merge changes from topic "am-
8e0e30ce-6e2e-43b5-a842-
3581d218043b" into oc-dev
am:
0adf6e1981
Change-Id: I689851b43fd7ad2577badd4115571478d1597be3
Bill Yi [Mon, 1 Oct 2018 06:01:49 +0000 (23:01 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5587649e8f skipped:
07dfa0baae
am:
997014d63a -s ours
Change-Id: I20a39d2e1be36339d11611ed8db8963c624ed4a1
Bill Yi [Mon, 1 Oct 2018 05:58:21 +0000 (22:58 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
6105ad5932 skipped:
e50fc63e3d
am:
20ce1f4c33 -s ours
Change-Id: I78a7a1809236cb0867143d2c4deeddfbdc4e9a18
TreeHugger Robot [Mon, 1 Oct 2018 05:44:56 +0000 (05:44 +0000)]
Merge changes from topic "am-
59fcdedb-d1d8-4894-bcee-
75f4085aa930" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4b2cb1520 skipped:
853c7ca3a5
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4b2cb1520
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 1 Oct 2018 05:43:47 +0000 (05:43 +0000)]
Merge changes from topic "am-
51a4d236-f631-4fe1-9fa8-
50a6c5132ce4" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
73a5116af8 skipped:
b5f88962d5
[automerger skipped] Import translations. DO NOT MERGE skipped:
73a5116af8
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 1 Oct 2018 05:42:36 +0000 (05:42 +0000)]
Merge changes from topic "am-
95ed1a42-c734-497b-9e03-
f8de9f42ea61" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
4310d4d905 skipped:
ebf64faa28
[automerger skipped] Import translations. DO NOT MERGE skipped:
4310d4d905
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 1 Oct 2018 05:41:34 +0000 (05:41 +0000)]
Merge changes from topic "am-
25c8f1dd-79b2-410a-8aa9-
2fe914e32aa3" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
f40a0a8dae skipped:
110074be1a
[automerger skipped] Import translations. DO NOT MERGE skipped:
f40a0a8dae
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 1 Oct 2018 05:40:26 +0000 (05:40 +0000)]
Merge changes from topic "am-
4f2d7404-9a6c-4f5f-9d17-
25f79c4505ff" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
f6e12d6972 skipped:
f487edc7f2
[automerger skipped] Import translations. DO NOT MERGE skipped:
f6e12d6972
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 1 Oct 2018 05:39:25 +0000 (05:39 +0000)]
Merge changes from topic "am-
2e7b32c3-6d04-46ba-bfdc-
309eff7d76b0" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
b19a62bcf8 skipped:
5883bd3177
[automerger skipped] Import translations. DO NOT MERGE skipped:
b19a62bcf8
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 1 Oct 2018 05:38:16 +0000 (05:38 +0000)]
Merge changes from topic "am-
8e0e30ce-6e2e-43b5-a842-
3581d218043b" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
5587649e8f skipped:
07dfa0baae
[automerger skipped] Import translations. DO NOT MERGE skipped:
5587649e8f
Import translations. DO NOT MERGE
Meng Wang [Mon, 1 Oct 2018 03:31:04 +0000 (03:31 +0000)]
Merge "DO NOT MERGE New carrier config enhanced_4g_lte_title_variant_int" into pi-dev
Android Build Merger (Role) [Sun, 30 Sep 2018 14:29:09 +0000 (14:29 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4310d4d905 skipped:
ebf64faa28
Change-Id: I19569fa366d950bfbc0edbc0f5192941a0e53f1a
Android Build Merger (Role) [Sun, 30 Sep 2018 14:28:59 +0000 (14:28 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4310d4d905
Change-Id: I3e32708f8256546d3f80fc754af7f1f93bcf4eeb
Bill Yi [Sun, 30 Sep 2018 14:28:34 +0000 (07:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idbecc605a11e21c5135682deec928b6d48a43eb4
Auto-generated-cl: translation import
Android Build Merger (Role) [Sun, 30 Sep 2018 14:22:47 +0000 (14:22 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f6e12d6972 skipped:
f487edc7f2
Change-Id: I5fb47e70e875b563287122bb003c4ef600933540
Android Build Merger (Role) [Sun, 30 Sep 2018 14:22:35 +0000 (14:22 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f6e12d6972
Change-Id: I26a0651ab8352744f54468d34f0409d0eb8f7930
Bill Yi [Sun, 30 Sep 2018 14:22:12 +0000 (07:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I450f670e7cbe292d8d106331fe13c8439e076861
Auto-generated-cl: translation import
Android Build Merger (Role) [Sun, 30 Sep 2018 13:29:56 +0000 (13:29 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
73a5116af8 skipped:
b5f88962d5
Change-Id: Ia04eeeb8205991351086706ae38f3af5f6d954ab
Android Build Merger (Role) [Sun, 30 Sep 2018 13:29:43 +0000 (13:29 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
73a5116af8
Change-Id: Iaf434a5575965995d5daa15a083e0e679a73b508
Bill Yi [Sun, 30 Sep 2018 13:29:22 +0000 (06:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I39386c643d2d1dbfa360257407e6534883e1b3b0
Auto-generated-cl: translation import
Android Build Merger (Role) [Sun, 30 Sep 2018 13:19:02 +0000 (13:19 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4b2cb1520 skipped:
853c7ca3a5
Change-Id: Iae4d410b482b3dab1f607cfe6be36901f2acc448
Android Build Merger (Role) [Sun, 30 Sep 2018 13:18:47 +0000 (13:18 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4b2cb1520
Change-Id: I619f28b5ebea75c568b6b9dc6d0ac16870619be0
Bill Yi [Sun, 30 Sep 2018 13:18:17 +0000 (06:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I989d81faf1fce9338a30f4b89d6ab01f4a5c4a02
Auto-generated-cl: translation import
Android Build Merger (Role) [Sun, 30 Sep 2018 13:07:35 +0000 (13:07 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
b19a62bcf8 skipped:
5883bd3177
Change-Id: I602bacf08051d3d112a43f8559166c12eec993f9
Android Build Merger (Role) [Sun, 30 Sep 2018 13:07:25 +0000 (13:07 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
b19a62bcf8
Change-Id: If0f6fc2ec219fc27201f4d907008e082e6e194ee
Bill Yi [Sun, 30 Sep 2018 13:07:00 +0000 (06:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic381ee9e91646a44ffd0de0060758753fe0b128b
Auto-generated-cl: translation import
Android Build Merger (Role) [Sun, 30 Sep 2018 12:41:16 +0000 (12:41 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f40a0a8dae skipped:
110074be1a
Change-Id: I3a14cd01a1fd3a6e2afab24b32c66bed6380bffe
Android Build Merger (Role) [Sun, 30 Sep 2018 12:41:02 +0000 (12:41 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f40a0a8dae
Change-Id: I482be7b38a2da01e29fad0ef3051c51fe9b8b941
Bill Yi [Sun, 30 Sep 2018 12:40:29 +0000 (05:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I29393152567735bae14379e51c14ead7be31e6d2
Auto-generated-cl: translation import
Android Build Merger (Role) [Sun, 30 Sep 2018 12:35:02 +0000 (12:35 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
6105ad5932 skipped:
e50fc63e3d
Change-Id: Iab79e57d33e496e6a7a8d6254490684b940c8b32
Android Build Merger (Role) [Sun, 30 Sep 2018 12:34:48 +0000 (12:34 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
6105ad5932
Change-Id: I72bd220fef91e2a5bc5b7774d5195b0f65099b48
OSDN Git Service
