OSDN Git Service
Dongwon Kang [Tue, 6 Mar 2018 01:15:50 +0000 (01:15 +0000)]
Merge changes Iecf8b207,I2f2a05ef into pi-dev
am:
081d3d2d89
Change-Id: If5ac9d3e67a0156f6bbe9397c13e036b3ba9a815
Tej Singh [Tue, 6 Mar 2018 01:07:22 +0000 (01:07 +0000)]
Merge "DO NOT MERGE Dummy StatsLog class" am:
84bda3a709 -s ours
am:
f2fdc81f33 -s ours
Change-Id: I74e707e09a47c976acfb3c39acdc1c0d53012855
Android Build Merger (Role) [Tue, 6 Mar 2018 01:03:33 +0000 (01:03 +0000)]
Merge "Merge "Improve javadocs of some DPM APIs" into pi-dev am:
889cf2e00d" into pi-dev-plus-aosp
Tony Mak [Tue, 6 Mar 2018 01:03:14 +0000 (01:03 +0000)]
Merge "Improve javadocs of some DPM APIs" into pi-dev
am:
889cf2e00d
Change-Id: I39e374287a4c37dfd644e5b4292f0801070ce6ad
Chen Xu [Tue, 6 Mar 2018 01:00:36 +0000 (01:00 +0000)]
Merge "API review: rename CarrierIdentification to Carrier id" am:
f01600d5f9
am:
ce7404744f
Change-Id: Iad12593f9e027052185f9efcb65a1983dda22a16
Android Build Merger (Role) [Tue, 6 Mar 2018 00:53:07 +0000 (00:53 +0000)]
Merge "Merge "Bluetooth: Enable Multi-A2DP/HFP support for up to 5 devices" am:
6ec103c746 am:
472ff2a79d" into pi-dev-plus-aosp
Jack He [Tue, 6 Mar 2018 00:52:47 +0000 (00:52 +0000)]
Merge "Bluetooth: Enable Multi-A2DP/HFP support for up to 5 devices" am:
6ec103c746
am:
472ff2a79d
Change-Id: Ib6accd1c4ea332eb04ab0246e3e9697c6ba4b4b4
Beverly [Tue, 6 Mar 2018 00:52:43 +0000 (00:52 +0000)]
Merge "Metric constants for dnd system and duration" into pi-dev
am:
74cfe56742
Change-Id: Ia3368c08194e7115d246c371a2f7184679377624
Tej Singh [Tue, 6 Mar 2018 00:50:33 +0000 (00:50 +0000)]
Merge "DO NOT MERGE Dummy StatsLog class"
am:
84bda3a709 -s ours
Change-Id: If6a663dc3b9abe19a2cfb18ab5688b401bd2f624
Android Build Merger (Role) [Tue, 6 Mar 2018 00:46:59 +0000 (00:46 +0000)]
Merge "Merge "Move SignalDrawable to SettingsLib so every can enjoy it" am:
2fa0f7964f am:
d9152570b0 -s ours" into pi-dev-plus-aosp
Evan Laird [Tue, 6 Mar 2018 00:46:34 +0000 (00:46 +0000)]
Merge "Move SignalDrawable to SettingsLib so every can enjoy it" am:
2fa0f7964f
am:
d9152570b0 -s ours
Change-Id: I448448c4ee3147f5157e1d2ff1e2af2265fd9d34
Mike Digman [Tue, 6 Mar 2018 00:44:22 +0000 (00:44 +0000)]
Merge "Increase rotate suggestion timeout in fullscreen" into pi-dev
am:
ea36a69c7c
Change-Id: I1ffded01abc15fa57ff62e44d0d7d620674854ab
Chen Xu [Tue, 6 Mar 2018 00:40:19 +0000 (00:40 +0000)]
Merge "API review: rename CarrierIdentification to Carrier id"
am:
f01600d5f9
Change-Id: Ic75f2037d277ccce95b24003b152159c9c37e4fc
Jack He [Tue, 6 Mar 2018 00:35:28 +0000 (00:35 +0000)]
Merge "Bluetooth: Enable Multi-A2DP/HFP support for up to 5 devices"
am:
6ec103c746
Change-Id: I65f257023b7cdc245236e9804f2c0859f4ee1601
Wei Jia [Tue, 6 Mar 2018 00:32:57 +0000 (00:32 +0000)]
Merge "OWNER: add wjia" into pi-dev
am:
0db51ad50e
Change-Id: I86fe5bf078cb69f8a8b8b08027df4bdde141dcee
Evan Laird [Tue, 6 Mar 2018 00:32:49 +0000 (00:32 +0000)]
Merge "Move SignalDrawable to SettingsLib so every can enjoy it"
am:
2fa0f7964f
Change-Id: Id4b60a36c89736fe49e84d4748b4ed643cd21816
TreeHugger Robot [Tue, 6 Mar 2018 00:19:54 +0000 (00:19 +0000)]
Merge changes Iecf8b207,I2f2a05ef into pi-dev
* changes:
Make MP2.prepare|play handled with task queue
Remove unused imports in MediaPlayer2.
Lucas Dupin [Tue, 6 Mar 2018 00:18:28 +0000 (00:18 +0000)]
Merge "Tint keyguard icons" into pi-dev
am:
94e5d34d4e
Change-Id: I2140301e186a475a46aba92f76fdeffe0131570c
TreeHugger Robot [Mon, 5 Mar 2018 23:16:14 +0000 (23:16 +0000)]
Merge "Improve javadocs of some DPM APIs" into pi-dev
Treehugger Robot [Mon, 5 Mar 2018 23:14:48 +0000 (23:14 +0000)]
Merge "DO NOT MERGE Dummy StatsLog class"
Chen Xu [Mon, 5 Mar 2018 22:59:21 +0000 (22:59 +0000)]
Merge "API review: rename CarrierIdentification to Carrier id"
TreeHugger Robot [Mon, 5 Mar 2018 22:20:31 +0000 (22:20 +0000)]
Merge "Metric constants for dnd system and duration" into pi-dev
Mike Digman [Mon, 5 Mar 2018 22:15:06 +0000 (22:15 +0000)]
Merge "Increase rotate suggestion timeout in fullscreen" into pi-dev
Wei Jia [Mon, 5 Mar 2018 20:34:51 +0000 (20:34 +0000)]
Merge "OWNER: add wjia" into pi-dev
Treehugger Robot [Mon, 5 Mar 2018 20:32:37 +0000 (20:32 +0000)]
Merge "Bluetooth: Enable Multi-A2DP/HFP support for up to 5 devices"
Tony Mak [Wed, 28 Feb 2018 14:17:17 +0000 (14:17 +0000)]
Improve javadocs of some DPM APIs
FIX:
70332970
FIX:
73919570
FIX:
67495520
FIX:
71566404
Test: None
Change-Id: Ic9b485ff7c15e0d244cba9e71def8d5c41e52070
(cherry picked from commit
8309c8f7608cea212056ace1cedb8af4df1215e3)
Wei Jia [Mon, 5 Mar 2018 20:15:20 +0000 (12:15 -0800)]
OWNER: add wjia
Test: none
Bug:
63934228
Change-Id: I58fbe0ddd3303cfe8765dac1942cff71e6cbbd9c
Treehugger Robot [Mon, 5 Mar 2018 20:10:37 +0000 (20:10 +0000)]
Merge "Move SignalDrawable to SettingsLib so every can enjoy it"
Bill Yi [Mon, 5 Mar 2018 19:38:54 +0000 (19:38 +0000)]
Merge changes from topic "am-
d9c6be77-633d-4f98-8eb7-
b9106af9ba0f" into oc-dev am:
99cc6cb2a1 am:
c3f0a8e200 am:
659c534a47
am:
0bd7631cea
Change-Id: If6d4391731069035775d27dcb61f0bbda8fc8613
Mike Digman [Mon, 5 Mar 2018 19:14:39 +0000 (11:14 -0800)]
Increase rotate suggestion timeout in fullscreen
To use the rotate nav button in fullscreen the navbar must
become visible. This normally requires a user gesture which
makes it hard to hit the button given its normal timeout
duration. Make it easier to tap by effectively extending the
timeout if the suggestion is given when the navbar is
invisible.
Test: manual with fullscreen testing app
Change-Id: I54ac3dfb590df9b9a039c53984623497ca18fcb5
TreeHugger Robot [Mon, 5 Mar 2018 19:34:48 +0000 (19:34 +0000)]
Merge "Tint keyguard icons" into pi-dev
Dongwon Kang [Sat, 3 Mar 2018 02:10:49 +0000 (18:10 -0800)]
Make MP2.prepare|play handled with task queue
Test: plays video
Bug:
63934228
Change-Id: Iecf8b2079e87241365ab6b7b7b0a5a669c948427
Beverly [Mon, 5 Mar 2018 19:32:35 +0000 (14:32 -0500)]
Metric constants for dnd system and duration
Test: none
Bug:
73741459
Bug:
73362490
Change-Id: I01b7602e7bd05531c67fbb0c20b4d31ac7f5befe
Bill Yi [Mon, 5 Mar 2018 19:31:52 +0000 (19:31 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c9f5891a7f skipped:
0a1d5cc852 am:
4532cd3395 -s ours am:
87addf6d04 -s ours am:
dd865d9fe7 -s ours
am:
cfad81db08 -s ours
Change-Id: I54f1f1bff569905cc0287293c4e7b832604d91ec
Bill Yi [Mon, 5 Mar 2018 19:14:08 +0000 (19:14 +0000)]
Merge changes from topic "am-
d9c6be77-633d-4f98-8eb7-
b9106af9ba0f" into oc-dev am:
99cc6cb2a1 am:
c3f0a8e200
am:
659c534a47
Change-Id: I25798e2a43ed487320bd408a154140392a72f9cb
Dongwon Kang [Fri, 2 Mar 2018 18:08:53 +0000 (10:08 -0800)]
Remove unused imports in MediaPlayer2.
Test: build.
Change-Id: I2f2a05ef4fc41d14f91e6805217852adf5bbb28e
Bill Yi [Mon, 5 Mar 2018 19:07:26 +0000 (19:07 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c9f5891a7f skipped:
0a1d5cc852 am:
4532cd3395 -s ours am:
87addf6d04 -s ours
am:
dd865d9fe7 -s ours
Change-Id: Idd316e6f5de4640ae1c4521fb817a181e00cfc63
Bill Yi [Mon, 5 Mar 2018 19:01:28 +0000 (19:01 +0000)]
Merge changes from topic "am-
d9c6be77-633d-4f98-8eb7-
b9106af9ba0f" into oc-dev am:
99cc6cb2a1
am:
c3f0a8e200
Change-Id: Ia23c96b2880f13df80c3955c5acb0822bb6f2dd9
Bill Yi [Mon, 5 Mar 2018 18:56:01 +0000 (18:56 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c9f5891a7f skipped:
0a1d5cc852 am:
4532cd3395 -s ours
am:
87addf6d04 -s ours
Change-Id: I0cb81b26368af76cfef8b4104df9ac0722f1ac3f
Julia Reynolds [Mon, 5 Mar 2018 18:40:49 +0000 (18:40 +0000)]
Merge "Metrics for DND suppressed visual effects" into pi-dev
am:
343c2157fc
Change-Id: I703cf421a364449f0642dfc5fde06c3505152ffd
Bill Yi [Mon, 5 Mar 2018 18:37:15 +0000 (18:37 +0000)]
Merge changes from topic "am-
d9c6be77-633d-4f98-8eb7-
b9106af9ba0f" into oc-dev
am:
99cc6cb2a1
Change-Id: I618380bb159e5f394fabcc9ff69bde6f2d0679d5
Bill Yi [Mon, 5 Mar 2018 18:35:22 +0000 (18:35 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c9f5891a7f skipped:
0a1d5cc852
am:
4532cd3395 -s ours
Change-Id: Ia8e72bfd84aeb59e7138e04f943abd73fd1cceb9
Adrian Roos [Mon, 5 Mar 2018 18:34:50 +0000 (18:34 +0000)]
DisplayCutout API: Make constructor public and adjust javadoc
am:
9bbd9661c0
Change-Id: Ia8cff9659b65e03a4a03af7f28939fa1712a2cb2
TreeHugger Robot [Mon, 5 Mar 2018 17:57:45 +0000 (17:57 +0000)]
Merge changes from topic "am-
d9c6be77-633d-4f98-8eb7-
b9106af9ba0f" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
c9f5891a7f skipped:
0a1d5cc852
[automerger skipped] Import translations. DO NOT MERGE skipped:
c9f5891a7f
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 5 Mar 2018 17:50:57 +0000 (17:50 +0000)]
Merge "Metrics for DND suppressed visual effects" into pi-dev
Lucas Dupin [Sat, 3 Mar 2018 22:05:04 +0000 (14:05 -0800)]
Tint keyguard icons
Test: visual
Change-Id: I7915c4ad1cd4bcb852a7bdd68e9f57fda7f985c6
Fixes:
71599427
(cherry picked from commit
914b708645f3f183719dd53623900a1609c6579b)
Julia Reynolds [Fri, 2 Mar 2018 19:53:15 +0000 (14:53 -0500)]
Metrics for DND suppressed visual effects
Bug:
74075050
Test: make
Change-Id: I6421401197207124e879326ea782bf2e4c5cc402
Erik Kline [Mon, 5 Mar 2018 15:13:01 +0000 (15:13 +0000)]
Merge "Fail if the interface is not available when starting" am:
b331b02da9
am:
a1f407d0f5
Change-Id: Ifd27f5d908947cd7b4e1b8d54f9fa87e43ebb11b
Erik Kline [Mon, 5 Mar 2018 15:05:08 +0000 (15:05 +0000)]
Merge "Fail if the interface is not available when starting"
am:
b331b02da9
Change-Id: If9a8b1bc88b7358919d67f0ebaf01115bd1af69e
Adrian Roos [Fri, 2 Mar 2018 13:31:37 +0000 (14:31 +0100)]
DisplayCutout API: Make constructor public and adjust javadoc
Change-Id: I093cf4f9ea60f00e187aeb4a548f3f5789d87fa1
Fixes:
73953880
Test: make update-api
(cherry picked from commit
d61db603fecefc72ce6454d34b24bab821337295)
Erik Kline [Mon, 5 Mar 2018 12:39:28 +0000 (12:39 +0000)]
Merge "Fail if the interface is not available when starting"
Lorenzo Colitti [Mon, 5 Mar 2018 12:23:35 +0000 (12:23 +0000)]
Merge "Add DNS_TETHER to the list of UIDs in the framework." am:
0b8d55e633
am:
c64dc7c632
Change-Id: Ie73be466fe9ace9a3ca8d8d7594ad41967186261
Erik Kline [Fri, 2 Mar 2018 07:51:13 +0000 (16:51 +0900)]
Fail if the interface is not available when starting
Addresses a long-standing TODO. Now, when calling IpClient's
startProvisioning(), the interface has to be available (i.e.
InterfaceParams#getByName() must return non-null).
Also:
- add a test
- refactor for testability
- delete some constructors no longer used
- properly handle passed-in null IpClient.Callback
- some more IpManager -> IpClient renaming
- permit recording metrics before starting a provisioning
attempt (logging immediate errors) without Log.wtf().
Test: as follows
- built
- flashed
- booted
- runtest frameworks/opt/net/wifi/tests/wifitests/runtests.sh passes
- runtest frameworks-net passes
- basic WiFi IpClient connections works fine
Bug:
62476366
Bug:
73487570
Change-Id: Ic83ad2a65637277dcb273feb27b2d1bb7a11eb2b
Lorenzo Colitti [Mon, 5 Mar 2018 09:46:59 +0000 (09:46 +0000)]
Merge "Add DNS_TETHER to the list of UIDs in the framework."
am:
0b8d55e633
Change-Id: I2162a009968c1bcfbfc32a41f14c0e7cad81a8a7
Treehugger Robot [Mon, 5 Mar 2018 07:40:36 +0000 (07:40 +0000)]
Merge "Add DNS_TETHER to the list of UIDs in the framework."
Hyundo Moon [Mon, 5 Mar 2018 05:44:41 +0000 (05:44 +0000)]
Merge "MediaController2: Ensure NonNull for parameters of public methods"
TreeHugger Robot [Mon, 5 Mar 2018 05:43:44 +0000 (05:43 +0000)]
Merge "Add #alerts to StatsdStats printout"
Hyundo Moon [Wed, 28 Feb 2018 08:31:00 +0000 (17:31 +0900)]
MediaController2: Ensure NonNull for parameters of public methods
Bug:
73863865
Test: Passed MediaBrowser2Test
Change-Id: I65cd43045f4e7b9f16b8cf3f43688815e59dc643
TreeHugger Robot [Mon, 5 Mar 2018 01:23:19 +0000 (01:23 +0000)]
Merge "AID: Change loop to repeat and set from xml"
TreeHugger Robot [Mon, 5 Mar 2018 01:12:19 +0000 (01:12 +0000)]
Merge "Make OnHeaderDecodedListener NonNull"
TreeHugger Robot [Sun, 4 Mar 2018 22:53:05 +0000 (22:53 +0000)]
Merge "Adds two more metrics categories for ATV Settings."
TreeHugger Robot [Sun, 4 Mar 2018 17:47:14 +0000 (17:47 +0000)]
Merge "Fix crash with AppComponentFactory"
Jaewan Kim [Fri, 2 Mar 2018 06:55:12 +0000 (15:55 +0900)]
MediaSession2: Clean up TODOs under frameworks/base/services
This CL includes following changes
- Remove outdated TODOs
- Added buganizer issue if the remaining work takes more than 5m
Test: Run MediaComponents tests
Change-Id: I0bda68dba58a71824107b58527f71cc1f8d1f949
Jaewan Kim [Fri, 2 Mar 2018 05:13:10 +0000 (14:13 +0900)]
MediaSession2: Clean up TODOs under frameworks/base/media
This CL includes following changes
- Remove outdated TODOs
- Added buganizer issue if the remaining work take more than 5m
Test: Run MediaComponents tests
Change-Id: I8968e12aabcbc67f69dbf14485b3716d0e95779b
TreeHugger Robot [Sun, 4 Mar 2018 04:29:55 +0000 (04:29 +0000)]
Merge "Fix link-type check warning on com.android.nfc_extras"
Yuan Lu [Sun, 4 Mar 2018 01:29:08 +0000 (01:29 +0000)]
Merge "Add the flag for only alowing wifi on charger/network request option"
Lucas Dupin [Sun, 4 Mar 2018 00:44:51 +0000 (00:44 +0000)]
Merge "Delete legacy code"
TreeHugger Robot [Sat, 3 Mar 2018 23:36:37 +0000 (23:36 +0000)]
Merge "Revert "Introduce InputConnection#reportLanguageHint()""
Jack He [Wed, 28 Feb 2018 03:34:49 +0000 (19:34 -0800)]
Bluetooth: Enable Multi-A2DP/HFP support for up to 5 devices
* Set config_bluetooth_max_connected_audio_devices to 5
Bug:
64767509
Test: runtest -j32 bluetooth
connect and disconnect to multiple headsets and car kits
TestTracker/146725
Change-Id: I211c5683490fd4be00d3379e11e843081c6fb3a6
Bryce Lee [Sat, 3 Mar 2018 14:50:57 +0000 (14:50 +0000)]
Merge "Address destroying activities multiple times."
Bill Yi [Sat, 3 Mar 2018 13:26:44 +0000 (13:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
5b67a302d4 -s ours
am:
5f311906c0 -s ours
Change-Id: I437186c5c0ce68e4b9a3136aa44cef70a997a890
Bill Yi [Sat, 3 Mar 2018 13:18:11 +0000 (13:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
5b67a302d4 -s ours
Change-Id: Ieab93fb1ab78ad5633e328eee9c59616239ea487
TreeHugger Robot [Sat, 3 Mar 2018 12:01:20 +0000 (12:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 3 Mar 2018 09:18:51 +0000 (09:18 +0000)]
Merge changes from topic "am-
6f0d1125-8060-4e8b-afe5-
8e18597ac90b" into oc-dev am:
ee97cf22ba am:
ceb2e462f8 am:
462e72e57d
am:
5c9582b417
Change-Id: I9205bf86b72a9f727a19a7b2a7dc61555be1792b
Bill Yi [Sat, 3 Mar 2018 09:12:25 +0000 (09:12 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
dfffd1a532 skipped:
b8f08e00fd am:
4cd38db343 -s ours am:
d1ed6e90b2 -s ours am:
7e354b0ffe -s ours
am:
8dcf817d44 -s ours
Change-Id: I1f340310ff1a1e528e647728de149e5ef588ae4e
Bill Yi [Sat, 3 Mar 2018 08:52:05 +0000 (08:52 +0000)]
Merge changes from topic "am-
9b4b0f8c-4823-4712-936a-
f4aafe519eff" into oc-dev am:
13ac18d299 am:
585ba6b3ec am:
cfa5b7fa32
am:
f611143dcb
Change-Id: I0ef4467e0affe88d14c132b277774ca208d4e83a
Bill Yi [Sat, 3 Mar 2018 08:51:12 +0000 (08:51 +0000)]
Merge changes from topic "am-
6f0d1125-8060-4e8b-afe5-
8e18597ac90b" into oc-dev am:
ee97cf22ba am:
ceb2e462f8
am:
462e72e57d
Change-Id: I50253fa1812ff0b944219513c2c99598e0b75d8e
Bill Yi [Sat, 3 Mar 2018 08:44:59 +0000 (08:44 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
dfffd1a532 skipped:
b8f08e00fd am:
4cd38db343 -s ours am:
d1ed6e90b2 -s ours
am:
7e354b0ffe -s ours
Change-Id: Ic8151011ed5e74939d74d567765f10817abced9e
Bill Yi [Sat, 3 Mar 2018 08:44:57 +0000 (08:44 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed skipped:
b0046a8e4e am:
dbea58fe4b -s ours am:
6a223c3aaa -s ours am:
3d12b053bc -s ours
am:
b8d90e47ef -s ours
Change-Id: I27d3617e32d59dde9324bf63a3912d12c6604816
Bill Yi [Sat, 3 Mar 2018 08:23:19 +0000 (08:23 +0000)]
Merge changes from topic "am-
2cc1b50f-d7fa-4824-840a-
51adc851b2fa" into oc-dev am:
b59324afa1 am:
bf7981bf90 am:
aed8d39fe7
am:
b1974396f9
Change-Id: I158fa5d27c9d02c1c76f362f035de6c00a2f29e5
Bill Yi [Sat, 3 Mar 2018 08:22:31 +0000 (08:22 +0000)]
Merge changes from topic "am-
9b4b0f8c-4823-4712-936a-
f4aafe519eff" into oc-dev am:
13ac18d299 am:
585ba6b3ec
am:
cfa5b7fa32
Change-Id: I12fa15bd34e438b3a26dbb0bcfafb2e6b0148deb
Bill Yi [Sat, 3 Mar 2018 08:21:46 +0000 (08:21 +0000)]
Merge changes from topic "am-
6f0d1125-8060-4e8b-afe5-
8e18597ac90b" into oc-dev am:
ee97cf22ba
am:
ceb2e462f8
Change-Id: I1d0313a868fd0083b78994912746f1fbe5acf714
Bill Yi [Sat, 3 Mar 2018 08:15:59 +0000 (08:15 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
dfffd1a532 skipped:
b8f08e00fd am:
4cd38db343 -s ours
am:
d1ed6e90b2 -s ours
Change-Id: I6afd2c8ac6b486398cd0cc9d051d5ebef456bfaa
Bill Yi [Sat, 3 Mar 2018 08:15:50 +0000 (08:15 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905 skipped:
2a68a8d9ad am:
551e9b00ee -s ours am:
7d05ce8473 -s ours am:
db8a0233a4 -s ours
am:
515556988f -s ours
Change-Id: Ic42ab0f8da9f3473ffcbfca130298ea185851802
Bill Yi [Sat, 3 Mar 2018 08:15:40 +0000 (08:15 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed skipped:
b0046a8e4e am:
dbea58fe4b -s ours am:
6a223c3aaa -s ours
am:
3d12b053bc -s ours
Change-Id: Id2eeb3af6cd35bae85d1dedbcf8bf450534195b8
Bill Yi [Sat, 3 Mar 2018 08:09:41 +0000 (08:09 +0000)]
Merge changes from topic "am-
9b4b0f8c-4823-4712-936a-
f4aafe519eff" into oc-dev am:
13ac18d299
am:
585ba6b3ec
Change-Id: I70d1513b0c85f9a31eafe5cb1785e47ab7e29ed9
Bill Yi [Sat, 3 Mar 2018 08:05:08 +0000 (08:05 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7a217545ed skipped:
b0046a8e4e am:
dbea58fe4b -s ours
am:
6a223c3aaa -s ours
Change-Id: Idf18f2f7f59f15c12ed1f18c337f6a08913b7f34
Bill Yi [Sat, 3 Mar 2018 07:56:54 +0000 (07:56 +0000)]
Merge changes from topic "am-
72eed970-759d-4148-b4df-
72c2aa104b56" into oc-dev am:
3850cf69e3 am:
bad5ea4cb1 am:
0c557735b7
am:
83e2dc6874
Change-Id: I1b634dcf6691cd68c72d6241045f8cfe467d97fc
Bill Yi [Sat, 3 Mar 2018 07:55:51 +0000 (07:55 +0000)]
Merge changes from topic "am-
2cc1b50f-d7fa-4824-840a-
51adc851b2fa" into oc-dev am:
b59324afa1 am:
bf7981bf90
am:
aed8d39fe7
Change-Id: Id390a60af18718f4eb375318c3ea8eb1a2f85e10
Bill Yi [Sat, 3 Mar 2018 07:49:06 +0000 (07:49 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
73534775a6 skipped:
9c8f34f724 am:
ac782db7b2 -s ours am:
1f6fdce0b0 -s ours am:
b90a10513e -s ours
am:
9d9ea4c320 -s ours
Change-Id: I98975c0659945be13e318b5a296fa849768eea3a
Bill Yi [Sat, 3 Mar 2018 07:49:05 +0000 (07:49 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905 skipped:
2a68a8d9ad am:
551e9b00ee -s ours am:
7d05ce8473 -s ours
am:
db8a0233a4 -s ours
Change-Id: I8e64f428f1fc95d5387459a3f25c94e9bace9377
Bill Yi [Sat, 3 Mar 2018 07:37:08 +0000 (07:37 +0000)]
Merge changes from topic "am-
2cc1b50f-d7fa-4824-840a-
51adc851b2fa" into oc-dev am:
b59324afa1
am:
bf7981bf90
Change-Id: Ib3e91f95f6bb6cde1c65be0d3cd9a9e3b45b0e7e
Bill Yi [Sat, 3 Mar 2018 07:36:55 +0000 (07:36 +0000)]
Merge changes from topic "am-
72eed970-759d-4148-b4df-
72c2aa104b56" into oc-dev am:
3850cf69e3 am:
bad5ea4cb1
am:
0c557735b7
Change-Id: I84b3def855146d6db4d9bd623e9e96c89e8081d4
Bill Yi [Sat, 3 Mar 2018 07:32:32 +0000 (07:32 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
52ebdfd973 skipped:
c400b6da60 am:
fa863f597e -s ours am:
3d82e195f7 -s ours am:
0f9e3adcda -s ours
am:
2bbfea01e4 -s ours
Change-Id: Ib8fd9e360d017c7e8e2170d274485639435e3b44
Bill Yi [Sat, 3 Mar 2018 07:31:51 +0000 (07:31 +0000)]
Merge changes from topic "am-
6f0d1125-8060-4e8b-afe5-
8e18597ac90b" into oc-dev
am:
ee97cf22ba
Change-Id: Ia9e780f378a33f48434d1e98760091d3642c8990
Bill Yi [Sat, 3 Mar 2018 07:30:57 +0000 (07:30 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5d8bb93905 skipped:
2a68a8d9ad am:
551e9b00ee -s ours
am:
7d05ce8473 -s ours
Change-Id: I5c502117018ae3a155feaacd0e72ce14c302728b
Bill Yi [Sat, 3 Mar 2018 07:29:59 +0000 (07:29 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
73534775a6 skipped:
9c8f34f724 am:
ac782db7b2 -s ours am:
1f6fdce0b0 -s ours
am:
b90a10513e -s ours
Change-Id: Iebc8057fc5a7fb58e90bc71db5dd25a456583e12
Bill Yi [Sat, 3 Mar 2018 07:29:56 +0000 (07:29 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
dfffd1a532 skipped:
b8f08e00fd
am:
4cd38db343 -s ours
Change-Id: I1800067c2cb7ca5de32951338f2548390c396fad
Masaho Nishikawa [Sat, 3 Mar 2018 07:28:54 +0000 (07:28 +0000)]
Merge "Add config to show an alert dialog for video charges" am:
1451124f86 am:
2c773d3f96
am:
513044b23a
Change-Id: I94af04cf0fca1dbcb6bb66cddcd473df22790f5f
Bill Yi [Sat, 3 Mar 2018 07:17:16 +0000 (07:17 +0000)]
Merge changes from topic "am-
9b4b0f8c-4823-4712-936a-
f4aafe519eff" into oc-dev
am:
13ac18d299
Change-Id: I1e5b02cb9baad310f20bace33ce89c9668fbb3c0
OSDN Git Service
