OSDN Git Service
jackqdyulei [Wed, 31 May 2017 20:53:16 +0000 (13:53 -0700)]
Update string for not charging.
This string means that even though charger is connected, the charger
is not charging the battery
Bug:
37546354
Test: Build
Change-Id: Ib7000047eb97623132f681d0c12833ed1ce385e6
Bill Yi [Thu, 27 Jul 2017 00:58:08 +0000 (00:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
3875d1a103 -s ours am:
995029b529 -s ours
am:
1e8ed22be2 -s ours
Change-Id: I1590d538bffee3129a6b7a840936d9eae44b851e
Bill Yi [Thu, 27 Jul 2017 00:48:16 +0000 (00:48 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
c2b08ca602 -s ours am:
aec51f497c -s ours
am:
b57520aae6 -s ours
Change-Id: Id6f6b18e639fa1d21964e79dfb40705275ed34fa
Tima Vaisburd [Thu, 27 Jul 2017 00:45:21 +0000 (00:45 +0000)]
Merge "Unhide get/setTextClassifier in WebView" into oc-mr1-dev
Bill Yi [Thu, 27 Jul 2017 00:34:04 +0000 (00:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
9724569903 -s ours am:
18b818e2dd -s ours
am:
415ca774d7 -s ours
Change-Id: Id74d022ccc416b1c3f528f9c2a210376f05582b8
Bill Yi [Thu, 27 Jul 2017 00:16:17 +0000 (00:16 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fbfd283125 -s ours" into nyc-mr2-dev am:
cd955ca6e5 -s ours am:
f66ddc099a -s ours
am:
b277fa8fb9 -s ours
Change-Id: I0a24e13600bea4b3b9cdba9d06b7cbb1386e0d4c
Bill Yi [Wed, 26 Jul 2017 23:50:08 +0000 (23:50 +0000)]
Merge "Import translations. DO NOT MERGE am:
69d0838208 -s ours" into nyc-mr2-dev am:
3bcdbff889 -s ours am:
6f24c015ef -s ours
am:
3c1c07a9fe -s ours
Change-Id: Ieb4d177e031103ab4d8a1fbda2402f1bf5fd5c50
Bill Yi [Wed, 26 Jul 2017 23:44:22 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
3875d1a103 -s ours
am:
995029b529 -s ours
Change-Id: I55aad5355130ace0d3b8826620b1bf1d0470ce23
Bill Yi [Wed, 26 Jul 2017 23:43:39 +0000 (23:43 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
a1bde91384 -s ours am:
cccb304acf -s ours" into oc-dr1-dev
am:
ab60d6b44e -s ours
Change-Id: Ibce37f648f7dca60466e8c64c928f141dd640932
Bill Yi [Wed, 26 Jul 2017 23:38:39 +0000 (23:38 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
c2b08ca602 -s ours
am:
aec51f497c -s ours
Change-Id: Iee66d395f034e3898ca805e4e7d6be141aec17bb
Bill Yi [Wed, 26 Jul 2017 23:37:14 +0000 (23:37 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
9bc30ce545 -s ours am:
611a6ffe29 -s ours" into oc-dr1-dev
am:
527cd8b04d -s ours
Change-Id: I6b4285fbad58d296305cee0e6698dd6925538024
Bill Yi [Wed, 26 Jul 2017 23:33:53 +0000 (23:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
9724569903 -s ours
am:
18b818e2dd -s ours
Change-Id: Id9ad618535461c7d0b60bf324d286980073ab52f
TreeHugger Robot [Wed, 26 Jul 2017 23:25:05 +0000 (23:25 +0000)]
Merge "resolve merge conflicts of
1e74fdb6842b to oc-mr1-dev" into oc-mr1-dev
Bill Yi [Wed, 26 Jul 2017 23:15:22 +0000 (23:15 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fbfd283125 -s ours" into nyc-mr2-dev am:
cd955ca6e5 -s ours
am:
f66ddc099a -s ours
Change-Id: If913cec6881240926b3866eccd4f2680c96bc1f7
Bill Yi [Wed, 26 Jul 2017 22:55:44 +0000 (22:55 +0000)]
Merge "Import translations. DO NOT MERGE am:
69d0838208 -s ours" into nyc-mr2-dev am:
3bcdbff889 -s ours
am:
6f24c015ef -s ours
Change-Id: Ifce7209bce43d5228d1f2e32b1fffa43daf5d793
Bill Yi [Wed, 26 Jul 2017 22:52:44 +0000 (22:52 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
3875d1a103 -s ours
Change-Id: Ife54f4e800fd4b81c5639984937096945f063d1d
Bill Yi [Wed, 26 Jul 2017 22:51:49 +0000 (22:51 +0000)]
Merge "Import translations. DO NOT MERGE am:
495d4ce1b9 -s ours am:
120c3e9874 -s ours" into oc-dr1-dev
am:
70906280eb -s ours
Change-Id: If5ae8d80646e4b2c68516e1441bc3b856c204907
Android Build Merger (Role) [Wed, 26 Jul 2017 22:51:17 +0000 (22:51 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
a1bde91384 -s ours am:
cccb304acf -s ours" into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 22:49:37 +0000 (22:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
c2b08ca602 -s ours
Change-Id: I0c8c1cc35fa6560dd1a40b22544ecd25dc7af0b2
Bill Yi [Wed, 26 Jul 2017 22:47:01 +0000 (22:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
a1bde91384 -s ours
am:
cccb304acf -s ours
Change-Id: Idae3b63b7017937b16bf124eaf329be1e1824e69
Aurimas Liutikas [Wed, 26 Jul 2017 22:46:36 +0000 (22:46 +0000)]
Merge "Revert "Update overscroll and toast UI"" into oc-dr1-dev
am:
0aadeed536
Change-Id: If30f10046c9b9952964e8656d0666c081e75c55f
Android Build Merger (Role) [Wed, 26 Jul 2017 22:45:45 +0000 (22:45 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
9bc30ce545 -s ours am:
611a6ffe29 -s ours" into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 22:44:26 +0000 (22:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
9724569903 -s ours
Change-Id: I8bcfd139861eb4ca6a0943e321b8032245e27a42
Bill Yi [Wed, 26 Jul 2017 22:41:01 +0000 (22:41 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
9bc30ce545 -s ours
am:
611a6ffe29 -s ours
Change-Id: Ie4eb3a673eb7e7b1f531a05e2b8a420516bccb4e
Android Build Merger (Role) [Wed, 26 Jul 2017 22:40:24 +0000 (22:40 +0000)]
Merge "Import translations. DO NOT MERGE am:
495d4ce1b9 -s ours am:
120c3e9874 -s ours" into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 22:39:47 +0000 (22:39 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fbfd283125 -s ours" into nyc-mr2-dev
am:
cd955ca6e5 -s ours
Change-Id: I643ac51ad7d162527ee4aa73da6568d94156083b
Bill Yi [Wed, 26 Jul 2017 22:37:35 +0000 (22:37 +0000)]
Import translations. DO NOT MERGE am:
495d4ce1b9 -s ours
am:
120c3e9874 -s ours
Change-Id: I149d23fe5cdedb0ecb813d252277e15e75055c01
Aurimas Liutikas [Wed, 26 Jul 2017 22:36:59 +0000 (22:36 +0000)]
Merge "Revert "Update overscroll and toast UI"" into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 22:35:23 +0000 (22:35 +0000)]
Merge "Import translations. DO NOT MERGE am:
69d0838208 -s ours" into nyc-mr2-dev
am:
3bcdbff889 -s ours
Change-Id: Id70f146241685a88bc2ba075d8e78745fd826878
Bill Yi [Wed, 26 Jul 2017 22:28:59 +0000 (22:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
a1bde91384 -s ours
Change-Id: Ic47dfa6fc6cad6123552c0493f40d3ac9a63822c
Bill Yi [Wed, 26 Jul 2017 22:25:46 +0000 (22:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
9bc30ce545 -s ours
Change-Id: I8676942d8e77918837208d400a2e87a0b4e3d935
Aurimas Liutikas [Wed, 26 Jul 2017 22:07:41 +0000 (22:07 +0000)]
Revert "Update overscroll and toast UI"
This change broke android.uirendering.cts.testclasses.EdgeEffectTests.
This reverts commit
6085f8a16b5f6ed6a7a7acf854ec29ff2bef45fa.
Bug:
64085792
Change-Id: I70ccebebb54dabf1ec0ee5002adca93e44104a1e
Bill Yi [Wed, 26 Jul 2017 22:21:36 +0000 (22:21 +0000)]
Import translations. DO NOT MERGE
am:
495d4ce1b9 -s ours
Change-Id: I1294580d3e9485f0367aca366054336d0dc3b9ed
TreeHugger Robot [Wed, 26 Jul 2017 22:16:34 +0000 (22:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Wed, 26 Jul 2017 22:14:51 +0000 (22:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Wed, 26 Jul 2017 22:13:05 +0000 (22:13 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Android Build Merger (Role) [Wed, 26 Jul 2017 22:04:23 +0000 (22:04 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fbfd283125 -s ours" into nyc-mr2-dev
Bill Yi [Wed, 26 Jul 2017 22:01:57 +0000 (22:01 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
fbfd283125 -s ours
Change-Id: I39f298c62ae870a0a764a1cb60d766e8e03f692b
Android Build Merger (Role) [Wed, 26 Jul 2017 22:01:37 +0000 (22:01 +0000)]
Merge "Import translations. DO NOT MERGE am:
69d0838208 -s ours" into nyc-mr2-dev
TreeHugger Robot [Wed, 26 Jul 2017 21:59:35 +0000 (21:59 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Wed, 26 Jul 2017 21:58:32 +0000 (21:58 +0000)]
Import translations. DO NOT MERGE
am:
69d0838208 -s ours
Change-Id: I25641bf4fbc60d8e40887a43965a602000bc8377
Lucas Dupin [Wed, 26 Jul 2017 21:53:20 +0000 (21:53 +0000)]
Merge "Text color of "shutdown" after removing overlay" into oc-dr1-dev
am:
c1edefc059
Change-Id: I9771f6c14fca2768b7b455792f6f62a1855ac4ec
TreeHugger Robot [Wed, 26 Jul 2017 21:48:22 +0000 (21:48 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Wed, 26 Jul 2017 21:36:36 +0000 (21:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Lucas Dupin [Wed, 26 Jul 2017 21:29:26 +0000 (21:29 +0000)]
Merge "Text color of "shutdown" after removing overlay" into oc-dr1-dev
Lucas Dupin [Fri, 21 Jul 2017 20:50:25 +0000 (13:50 -0700)]
Text color of "shutdown" after removing overlay
Bug:
63751714
Fixes:
64079315
Test: Visual, turn off device with white wallpaper set
Change-Id: I667d40135c8c7b4f498bc89f695cbfde5657588c
Fyodor Kupolov [Wed, 26 Jul 2017 20:50:47 +0000 (20:50 +0000)]
Merge "Tests for lookaside configuration" into oc-mr1-dev
Suprabh Shukla [Wed, 26 Jul 2017 20:43:11 +0000 (20:43 +0000)]
Merge "Read the correct parameters for Jobscheduler" into oc-dr1-dev
am:
a49681fab8
Change-Id: Ie09391bfb304ef6721c672e3a63078f9d66f95af
Suprabh Shukla [Wed, 26 Jul 2017 20:25:07 +0000 (20:25 +0000)]
Merge "Read the correct parameters for Jobscheduler" into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 20:12:30 +0000 (20:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Matthew Fritze [Wed, 26 Jul 2017 20:07:18 +0000 (20:07 +0000)]
Merge "Add metrics event for trampoline activity" into oc-dr1-dev
am:
44f7badb73
Change-Id: I7b9bf39041d91b35296952d5e6651ad83e9e81cd
TreeHugger Robot [Wed, 26 Jul 2017 20:01:50 +0000 (20:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Matthew Fritze [Wed, 26 Jul 2017 19:58:20 +0000 (19:58 +0000)]
Merge "Add metrics event for trampoline activity" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 19:57:22 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Antony Sargent [Tue, 18 Jul 2017 22:28:46 +0000 (15:28 -0700)]
resolve merge conflicts of
1e74fdb6842b to oc-mr1-dev
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I1e90e7ff397f7a995c9d6471c876be020e6de582
Merged-In: I92b56b7908e5be8a3553a2779646d48bb5b94f01
Sungsoo Lim [Wed, 26 Jul 2017 19:48:25 +0000 (19:48 +0000)]
Merge "Fix NPE in MediaRouterService" into oc-dr1-dev
am:
bba60fadc7
Change-Id: Idd61a0034321755fd7e53deb6e452e7a14d0ba44
Sungsoo [Wed, 26 Jul 2017 19:45:04 +0000 (19:45 +0000)]
Merge "Restore the selected route when an app starts to make sound" into oc-dr1-dev
am:
d7ff18dac8 -s ours
Change-Id: I88874d4f445b4769e6f5222388b2620f1d2801c6
TreeHugger Robot [Wed, 26 Jul 2017 19:14:36 +0000 (19:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 18:59:13 +0000 (18:59 +0000)]
Merge "Don't attribute incorrect unified challenge attempt to profile." into oc-mr1-dev
Bill Yi [Wed, 26 Jul 2017 18:47:25 +0000 (18:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
b978569fce -s ours
Change-Id: I5b78e73fc5fb303b739ef85788866f1c95c6195b
TreeHugger Robot [Wed, 26 Jul 2017 18:41:38 +0000 (18:41 +0000)]
Merge "Fix NPE in MediaRouterService" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 18:40:20 +0000 (18:40 +0000)]
Merge "Restore the selected route when an app starts to make sound" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 18:39:16 +0000 (18:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 18:32:39 +0000 (18:32 +0000)]
Merge "DO NOT MERGE - Wraps custom save subtitle on ScrollView." into oc-mr1-dev
Bill Yi [Wed, 26 Jul 2017 18:24:13 +0000 (18:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
900d7157c0 -s ours
Change-Id: I36c4d906aa15db83b8d199287413437b8c03fd3a
Bill Yi [Wed, 26 Jul 2017 18:20:30 +0000 (18:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
56b37be1c9 -s ours
Change-Id: I8f3ff43e58be87e3f7fa8c303fac180c7fb74266
Bill Yi [Wed, 26 Jul 2017 18:06:04 +0000 (18:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
2a2845a483 -s ours
Change-Id: Id4d5900551e15ae96cde2b63cf846aff7f80f6ea
Bill Yi [Wed, 26 Jul 2017 18:03:33 +0000 (11:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I228aaf428e6298a9077e8f277c3e6e26b5ebd7a3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 18:02:05 +0000 (11:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I13f52e0726334b4ff47a780e3d5c41074d96aada
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 18:01:07 +0000 (11:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8b8dd3e35096ba23f1dd7cc01beba7b392167591
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 18:00:00 +0000 (11:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iebfe4076b754c857472076b3aa9d9fd0b491e6f7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 17:57:20 +0000 (10:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9be29c557742c6c1d233376f49088bcb3309bfb3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 17:42:20 +0000 (10:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9273d1c9e96d398653e3846dcdfdf2df5a070a57
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 17:40:40 +0000 (10:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: If6893b7757cc431a56096d7c708f600d3f2f8575
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
TreeHugger Robot [Wed, 26 Jul 2017 17:31:03 +0000 (17:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 17:23:59 +0000 (10:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7a677eabfe97553a7bddecfa88064d5e4edd37b6
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 17:04:20 +0000 (17:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Adrian Roos [Wed, 26 Jul 2017 16:59:16 +0000 (16:59 +0000)]
Merge "AOD: Only force doze brightness when actually unlocking" into oc-dr1-dev
am:
afda883f86
Change-Id: I343ee531e2bf5f658ba0693c7e0e402b395dc282
TreeHugger Robot [Wed, 26 Jul 2017 16:56:39 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Beverly [Wed, 26 Jul 2017 16:40:41 +0000 (16:40 +0000)]
Merge "Volume dialog doesn't show on ambient/aod." into oc-dr1-dev
am:
382644aa74
Change-Id: I7c8bfab80e82d2841f43a75ce7fddc0b03cacc70
TreeHugger Robot [Wed, 26 Jul 2017 16:39:56 +0000 (16:39 +0000)]
Merge "AOD: Only force doze brightness when actually unlocking" into oc-dr1-dev
Geoffrey Pitsch [Wed, 26 Jul 2017 16:29:01 +0000 (16:29 +0000)]
Merge "Remove ability to downgrade importance of existing channel." into oc-dr1-dev
am:
0d5c1490ce
Change-Id: I130816097bc68d1978b035cb2cfb0a3c678f9291
Bryce Lee [Wed, 26 Jul 2017 16:25:40 +0000 (16:25 +0000)]
Merge "Do not report app bound differences as a Configuration change." into oc-dr1-dev
am:
512e5d1b9b
Change-Id: If5c2ce81a92d751c3481d7613611b9373060f78a
Adrian Roos [Wed, 26 Jul 2017 16:22:52 +0000 (16:22 +0000)]
Merge "Fix flickery behavior when launching notification when occluded" into oc-dr1-dev
am:
dd22dcbcdf
Change-Id: I50d98b16eb4ce43a555a0136a74421e891754786
Antony Sargent [Wed, 26 Jul 2017 16:18:33 +0000 (16:18 +0000)]
Merge "@Keep all the things in TestAccessPointBuilder" into oc-dr1-dev
am:
1e74fdb684 -s ours
Change-Id: I489efc8ca8d93cd94ac71e2ea65f45e888a9a138
TreeHugger Robot [Wed, 26 Jul 2017 15:34:32 +0000 (15:34 +0000)]
Merge "Volume dialog doesn't show on ambient/aod." into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 15:05:55 +0000 (08:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia56580662240b965d77ec102ea91a8b0ea5a8bab
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 15:03:02 +0000 (08:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie143437207858ada42d95895b235e72f6ac8926f
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 15:00:54 +0000 (08:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic35926e27018d65db6f2972f183cb7242687a483
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 14:58:46 +0000 (07:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iccb89ad7674386c75d6ce19d6bfaa037b03e4243
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Geoffrey Pitsch [Wed, 26 Jul 2017 14:31:23 +0000 (14:31 +0000)]
Merge "Remove ability to downgrade importance of existing channel." into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 14:30:33 +0000 (07:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia3879f9882a8fde1edcc669f31b4cb5125786ea5
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 14:27:44 +0000 (07:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I76674f28e858f631f43f88f041ce0b6798b30def
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Geoffrey Pitsch [Mon, 24 Jul 2017 15:24:21 +0000 (11:24 -0400)]
Remove ability to downgrade importance of existing channel.
Test: runtest systemui-notification
Bug:
63920384
Change-Id: Ic9f5c50c3d2a36ccd4ba9686dad1eb415b559215
Bill Yi [Wed, 26 Jul 2017 14:26:35 +0000 (07:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5232ba3964ba77e81d70d325f34630a153d2b22d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 14:25:10 +0000 (07:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iddda7b19049b1fc773e56eada5c4100ae14b39da
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bryce Lee [Wed, 26 Jul 2017 14:20:31 +0000 (14:20 +0000)]
Merge "Do not report app bound differences as a Configuration change." into oc-dr1-dev
Adrian Roos [Wed, 26 Jul 2017 11:47:01 +0000 (11:47 +0000)]
Merge "Fix flickery behavior when launching notification when occluded" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 10:53:34 +0000 (10:53 +0000)]
Merge "@Keep all the things in TestAccessPointBuilder" into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 08:26:17 +0000 (08:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
a7f60741ae -s ours
am:
4d00a9512a -s ours
Change-Id: I194fa29eb575b6bdd91a167c6d7826c4fda7df69
OSDN Git Service
