OSDN Git Service
Bill Yi [Wed, 26 Jul 2017 23:55:41 +0000 (23:55 +0000)]
Merge "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" into oc-dr1-dev-plus-aosp
am:
5c7bf3574e -s ours
Change-Id: Ifc76b77e304af22a26345ea5e71775c3d7997734
Android Build Merger (Role) [Wed, 26 Jul 2017 23:49:13 +0000 (23:49 +0000)]
Merge "Merge "resolve merge conflicts of
1e74fdb6842b to oc-mr1-dev" into oc-mr1-dev am:
eea2441f0a" into oc-mr1-dev-plus-aosp
Antony Sargent [Wed, 26 Jul 2017 23:46:27 +0000 (23:46 +0000)]
Merge "resolve merge conflicts of
1e74fdb6842b to oc-mr1-dev" into oc-mr1-dev
am:
eea2441f0a
Change-Id: I1a7aa500b686f3b7531db03e61bd12f108333850
Bill Yi [Wed, 26 Jul 2017 23:41:42 +0000 (23:41 +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:
45f115afad -s ours
am:
b52a575764 -s ours
Change-Id: I3afaf502d51a39d4ee57b6bb3d5fbe40abba631f
Android Build Merger (Role) [Wed, 26 Jul 2017 23:37:19 +0000 (23:37 +0000)]
Merge "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" into oc-dr1-dev-plus-aosp
Bill Yi [Wed, 26 Jul 2017 23:33:28 +0000 (23:33 +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: Ie638e9dd8e7c50a8b1352199ca46e4157d46f2c3
Bill Yi [Wed, 26 Jul 2017 23:32:44 +0000 (23:32 +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:
45f115afad -s ours
Change-Id: Ia2e8ff2e7847ee2d130d680e750ed5ff2aebeb8c
Bill Yi [Wed, 26 Jul 2017 23:31:54 +0000 (23:31 +0000)]
Merge "Import translations. DO NOT MERGE am:
69d0838208 -s ours" into nyc-mr2-dev am:
3bcdbff889 -s ours am:
6f24c015ef -s ours am:
5d74b7d676 -s ours
am:
9c867c86fd -s ours
Change-Id: I7d5f33aabfc9227f76f4d3cbec6546a04d3ab056
Bill Yi [Wed, 26 Jul 2017 23:26:01 +0000 (23:26 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
a1bde91384 -s ours am:
cccb304acf -s ours am:
8437c2d1f2 -s ours
am:
4be569ee04 -s ours
Change-Id: I5eb74c06a3abccec189a892c0f6f37f4fae9cacd
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
Android Build Merger (Role) [Wed, 26 Jul 2017 23:21:53 +0000 (23:21 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
9bc30ce545 -s ours am:
611a6ffe29 -s ours am:
b663a08d66 -s ours am:
971b02fca8 -s ours" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 26 Jul 2017 23:21:04 +0000 (23:21 +0000)]
Merge "Merge "Import translations. DO NOT MERGE am:
495d4ce1b9 -s ours am:
120c3e9874 -s ours" into oc-dr1-dev am:
70906280eb -s ours am:
d294d8dc06 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Wed, 26 Jul 2017 23:19:15 +0000 (23:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
9bc30ce545 -s ours am:
611a6ffe29 -s ours am:
b663a08d66 -s ours
am:
971b02fca8 -s ours
Change-Id: I53f86c147bbb8670265a9e1bb20565e8d391502d
Bill Yi [Wed, 26 Jul 2017 23:18:52 +0000 (23:18 +0000)]
Merge "Import translations. DO NOT MERGE am:
69d0838208 -s ours" into nyc-mr2-dev am:
3bcdbff889 -s ours am:
6f24c015ef -s ours
am:
5d74b7d676 -s ours
Change-Id: I51ad9da8af1dedb69b71c6950e5529d30f9a0548
Android Build Merger (Role) [Wed, 26 Jul 2017 23:18:20 +0000 (23:18 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE am:
495d4ce1b9 -s ours am:
120c3e9874 -s ours" into oc-dr1-dev am:
70906280eb -s ours" into oc-dr1-dev-plus-aosp am:
cd10d78d08 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Wed, 26 Jul 2017 23:17:32 +0000 (23:17 +0000)]
Merge "Import translations. DO NOT MERGE am:
495d4ce1b9 -s ours am:
120c3e9874 -s ours" into oc-dr1-dev am:
70906280eb -s ours
am:
d294d8dc06 -s ours
Change-Id: I088b359ab7ba22a41b806aa05330f36a413e886b
Bill Yi [Wed, 26 Jul 2017 23:12:50 +0000 (23:12 +0000)]
Merge "Merge "Import translations. DO NOT MERGE am:
495d4ce1b9 -s ours am:
120c3e9874 -s ours" into oc-dr1-dev am:
70906280eb -s ours" into oc-dr1-dev-plus-aosp
am:
cd10d78d08 -s ours
Change-Id: I500525867eb8081f23e650e8e24a321dc7171716
Aurimas Liutikas [Wed, 26 Jul 2017 23:12:21 +0000 (23:12 +0000)]
Merge "Revert "Update overscroll and toast UI"" into oc-dr1-dev am:
0aadeed536
am:
76ec2380fc
Change-Id: I57f02269d107ab2a3f114a20b650a60dbe7db60b
Bill Yi [Wed, 26 Jul 2017 23:09:29 +0000 (23:09 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
a1bde91384 -s ours am:
cccb304acf -s ours
am:
8437c2d1f2 -s ours
Change-Id: I1d941d3545f3e390ba5475ab3b77e59a37208d74
Bill Yi [Wed, 26 Jul 2017 23:09:07 +0000 (23:09 +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: Ia6630c6dd3cf9daf78fd3f07ebdc7515c548a3bd
Bill Yi [Wed, 26 Jul 2017 23:04:42 +0000 (23:04 +0000)]
Merge "Import translations. DO NOT MERGE am:
495d4ce1b9 -s ours am:
120c3e9874 -s ours am:
a279b21d0b -s ours" into oc-dr1-dev-plus-aosp
am:
3a9c5d39e6 -s ours
Change-Id: I9848a37f8a4d1b8d200f1ca90c29b5ffb99e5b26
Aurimas Liutikas [Wed, 26 Jul 2017 23:00:57 +0000 (23:00 +0000)]
Merge "Revert "Update overscroll and toast UI"" into oc-dr1-dev am:
0aadeed536
am:
4d5a1ff81c
Change-Id: Id0158fe95811436fccda10bf270a2e8d550dcdec
Bill Yi [Wed, 26 Jul 2017 23:00:56 +0000 (23:00 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
9bc30ce545 -s ours am:
611a6ffe29 -s ours
am:
b663a08d66 -s ours
Change-Id: I170c03e11efefdead715035b4946b32176b6ba99
Android Build Merger (Role) [Wed, 26 Jul 2017 22:56:44 +0000 (22:56 +0000)]
Merge "Merge "Import translations. DO NOT MERGE am:
495d4ce1b9 -s ours am:
120c3e9874 -s ours" into oc-dr1-dev am:
70906280eb -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Wed, 26 Jul 2017 22:55:38 +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: I1926ae43168fa88c14390130282d1517091c7129
Android Build Merger (Role) [Wed, 26 Jul 2017 22:53:38 +0000 (22:53 +0000)]
Merge "Import translations. DO NOT MERGE am:
495d4ce1b9 -s ours am:
120c3e9874 -s ours am:
a279b21d0b -s ours" into oc-dr1-dev-plus-aosp
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
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: I69f27513c7d98b7d99473fdf03b777bd41a7e7d9
Bill Yi [Wed, 26 Jul 2017 22:50:55 +0000 (22:50 +0000)]
Import translations. DO NOT MERGE am:
495d4ce1b9 -s ours am:
120c3e9874 -s ours
am:
a279b21d0b -s ours
Change-Id: I02dfb0789e0a190b75ed9c02cde4a671cb8c8c19
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
Aurimas Liutikas [Wed, 26 Jul 2017 22:46:34 +0000 (22:46 +0000)]
Merge "Revert "Update overscroll and toast UI"" into oc-dr1-dev
am:
0aadeed536
Change-Id: I88bf203f78319713f719fe2426c0c4a1e7770b11
Bill Yi [Wed, 26 Jul 2017 22:46:01 +0000 (22:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
a1bde91384 -s ours
am:
cccb304acf -s ours
Change-Id: Ic9fa84f60261dd11093f38c3e02845dc3da2a3a2
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: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
Bill Yi [Wed, 26 Jul 2017 22:40:44 +0000 (22:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
9bc30ce545 -s ours
am:
611a6ffe29 -s ours
Change-Id: I4c8c61a56288b7b4fdad4ccca07c51c0a8cfb38c
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
Bill Yi [Wed, 26 Jul 2017 22:37:25 +0000 (22:37 +0000)]
Import translations. DO NOT MERGE am:
495d4ce1b9 -s ours
am:
120c3e9874 -s ours
Change-Id: If6b7cc81b779c33a83506ccb0da87b7a643dd177
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
Lucas Dupin [Wed, 26 Jul 2017 22:05:29 +0000 (22:05 +0000)]
Merge "Text color of "shutdown" after removing overlay" into oc-dr1-dev am:
c1edefc059
am:
1244549858
Change-Id: Idb22b9d8e26a7bd73edcedf043fb7a06c16ff64b
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
Lucas Dupin [Wed, 26 Jul 2017 22:00:29 +0000 (22:00 +0000)]
Merge "Text color of "shutdown" after removing overlay" into oc-dr1-dev am:
c1edefc059
am:
679f7e408b
Change-Id: I58d43d04ebc3830a9e270d1bee696d6691cf3a08
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
Lucas Dupin [Wed, 26 Jul 2017 21:49:03 +0000 (21:49 +0000)]
Merge "Text color of "shutdown" after removing overlay" into oc-dr1-dev
am:
c1edefc059
Change-Id: I4f94f72778be7dc2ed64e63892df4463e72e78e1
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 21:04:15 +0000 (21:04 +0000)]
Merge "Tests for lookaside configuration" into oc-mr1-dev
am:
56bd583162
Change-Id: Ia1104164080db83a59a85d4fc43a457df09145bd
Android Build Merger (Role) [Wed, 26 Jul 2017 20:55:16 +0000 (20:55 +0000)]
Merge "Merge "Read the correct parameters for Jobscheduler" into oc-dr1-dev am:
a49681fab8 am:
1e868e444b" into oc-mr1-dev-plus-aosp
Suprabh Shukla [Wed, 26 Jul 2017 20:53:22 +0000 (20:53 +0000)]
Merge "Read the correct parameters for Jobscheduler" into oc-dr1-dev am:
a49681fab8
am:
1e868e444b
Change-Id: Ic1b16abaadf4a90fbf5934d23c0427d066b7b1f3
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:50:38 +0000 (20:50 +0000)]
Merge "Read the correct parameters for Jobscheduler" into oc-dr1-dev am:
a49681fab8
am:
47b9209265
Change-Id: I08d4921448906303473e3b72fa11c18d286059d1
Suprabh Shukla [Wed, 26 Jul 2017 20:43:14 +0000 (20:43 +0000)]
Merge "Read the correct parameters for Jobscheduler" into oc-dr1-dev
am:
a49681fab8
Change-Id: I67951e184ef30e59e11d26cf3eecdec65dc758b0
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
Bill Yi [Wed, 26 Jul 2017 20:36:37 +0000 (20:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
536c360c74 -s ours
Change-Id: Ib714bb7e4e435fd055ac41e806d1476125fb71ce
Matthew Fritze [Wed, 26 Jul 2017 20:30:32 +0000 (20:30 +0000)]
Merge "Add metrics event for trampoline activity" into oc-dr1-dev am:
44f7badb73
am:
2d194816ca
Change-Id: I50b67114fdc4fd825299a101b4eefe9f6464109f
Suprabh Shukla [Wed, 26 Jul 2017 20:25:07 +0000 (20:25 +0000)]
Merge "Read the correct parameters for Jobscheduler" into oc-dr1-dev
Android Build Merger (Role) [Wed, 26 Jul 2017 20:23:33 +0000 (20:23 +0000)]
Merge "Merge "Add metrics event for trampoline activity" into oc-dr1-dev am:
44f7badb73 am:
d112e6391b" into oc-mr1-dev-plus-aosp
Bill Yi [Wed, 26 Jul 2017 20:16:18 +0000 (20:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
79b7680773 -s ours
Change-Id: I7e91a70c32d7abb78eb8bff6aecb9ccb1f0c427b
Matthew Fritze [Wed, 26 Jul 2017 20:14:25 +0000 (20:14 +0000)]
Merge "Add metrics event for trampoline activity" into oc-dr1-dev am:
44f7badb73
am:
d112e6391b
Change-Id: Ic13893b4cca32a4e014fc8fb96370ee63234a188
Bill Yi [Wed, 26 Jul 2017 20:12:30 +0000 (20:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Wed, 26 Jul 2017 20:11:36 +0000 (20:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
20c5ac18db -s ours
Change-Id: I4db0803ab5e2ecb96b72773123fe0db218200a1d
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
Matthew Fritze [Wed, 26 Jul 2017 20:06:36 +0000 (20:06 +0000)]
Merge "Add metrics event for trampoline activity" into oc-dr1-dev
am:
44f7badb73
Change-Id: I3b05e624a77b66537e458ce87593c9a07058fbe3
TreeHugger Robot [Wed, 26 Jul 2017 20:01:50 +0000 (20:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Sungsoo Lim [Wed, 26 Jul 2017 20:00:40 +0000 (20:00 +0000)]
Merge "Fix NPE in MediaRouterService" into oc-dr1-dev am:
bba60fadc7
am:
5a3d561e2d
Change-Id: Ie2f4ccb46e0de6b177ff1f13ecc95fa7cabb04f9
Matthew Fritze [Wed, 26 Jul 2017 19:58:20 +0000 (19:58 +0000)]
Merge "Add metrics event for trampoline activity" into oc-dr1-dev
Sungsoo [Wed, 26 Jul 2017 19:57:35 +0000 (19:57 +0000)]
Merge "Restore the selected route when an app starts to make sound" into oc-dr1-dev am:
d7ff18dac8 -s ours
am:
2b123141b9
Change-Id: I4191528bca07d8f3062bbadfc6f99cf3dc13c622
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:49:09 +0000 (19:49 +0000)]
Merge "Fix NPE in MediaRouterService" into oc-dr1-dev am:
bba60fadc7
am:
95baa7765c
Change-Id: I787abff50bc59bc2b93794b33f02e218a5c14b10
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
Sungsoo [Wed, 26 Jul 2017 19:45:01 +0000 (19:45 +0000)]
Merge "Restore the selected route when an app starts to make sound" into oc-dr1-dev am:
d7ff18dac8
am:
96681b8f6b -s ours
Change-Id: I7191f06d4836ff606769ec3b9f0609512df499d3
Bill Yi [Wed, 26 Jul 2017 19:28:52 +0000 (19:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
cdb4d75890 -s ours
Change-Id: I118f5e788a1ad1fbf135a3ce499453d521e47745
Pavel Grafov [Wed, 26 Jul 2017 19:17:00 +0000 (19:17 +0000)]
Merge "Don't attribute incorrect unified challenge attempt to profile." into oc-mr1-dev
am:
c58e47cfdc
Change-Id: Id634671d9068d3919c8a1cbcfb9fb411ba69022b
TreeHugger Robot [Wed, 26 Jul 2017 19:14:36 +0000 (19:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Wed, 26 Jul 2017 19:06:15 +0000 (19:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
b978569fce -s ours
am:
6cb150d094 -s ours
Change-Id: Id5b0e0588628c151b384107ecc0e4a6fe4236917
Bill Yi [Wed, 26 Jul 2017 18:59:33 +0000 (18:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
b978569fce -s ours
am:
60ebd52445 -s ours
Change-Id: I5821409e3e3123435dd37d370b28057c1476c755
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
Sungsoo Lim [Wed, 26 Jul 2017 18:54:19 +0000 (18:54 +0000)]
Merge "Fix NPE in MediaRouterService" into oc-dr1-dev
am:
bba60fadc7
Change-Id: I28dbb73021ea5bfeec3fda3e35849ad446d65102
Sungsoo [Wed, 26 Jul 2017 18:51:16 +0000 (18:51 +0000)]
Merge "Restore the selected route when an app starts to make sound" into oc-dr1-dev
am:
d7ff18dac8
Change-Id: I52a17de61821c72e97336eb66f34a56444e13894
Bill Yi [Wed, 26 Jul 2017 18:47:26 +0000 (18:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
b978569fce -s ours
Change-Id: I4f5887b8444b16dab976ba9cb9383f68bc2a9f59
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
Felipe Leme [Wed, 26 Jul 2017 18:46:17 +0000 (18:46 +0000)]
Merge "DO NOT MERGE - Wraps custom save subtitle on ScrollView." into oc-mr1-dev
am:
ebbea789f6
Change-Id: Id9872fc279e2294bba7d43de9549524c45896c58
TreeHugger Robot [Wed, 26 Jul 2017 18:41:38 +0000 (18:41 +0000)]
Merge "Fix NPE in MediaRouterService" into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 18:41:27 +0000 (18:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
900d7157c0 -s ours
am:
e07f357cb7 -s ours
Change-Id: I4b9b55cfdfc0969afb8ff55398e2cc30e77e249f
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