git.osdn.net Git - android-x86/frameworks-base.git/log

Android Build Merger (Role) [Thu, 27 Jul 2017 01:02:44 +0000 (01:02 +0000)]

Merge "Merge "Unhide get/setTextClassifier in WebView" into oc-mr1-dev am: 2ebddfc398" into oc-mr1-dev-plus-aosp

Android Build Merger (Role) [Thu, 27 Jul 2017 01:00:08 +0000 (01:00 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602 -s ours am: aec51f497c -s ours am: a204358b18 -s ours am: 1c7370cf31 -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Tima Vaisburd [Thu, 27 Jul 2017 01:00:02 +0000 (01:00 +0000)]

Merge "Unhide get/setTextClassifier in WebView" into oc-mr1-dev
am: 2ebddfc398

Change-Id: I16b8d2e9ba044026603a9b2af12a678f192a10ec

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 00:57:26 +0000 (00:57 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602 -s ours am: aec51f497c -s ours am: a204358b18 -s ours
am: 1c7370cf31 -s ours

Change-Id: I4547a456913ffa2f18bb39777c654fe329341fec

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 00:56:59 +0000 (00:56 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9724569903 -s ours am: 18b818e2dd -s ours am: 415ca774d7 -s ours
am: 76f4f8a3e8 -s ours

Change-Id: I6c90ef54f41cd7f9047de791cf59b2a080cbf5b3

commit | commitdiff | tree

Tima Vaisburd [Thu, 27 Jul 2017 00:45:21 +0000 (00:45 +0000)]

Merge "Unhide get/setTextClassifier in WebView" into oc-mr1-dev

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 00:44:41 +0000 (00:44 +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
am: 1047a0ba4c -s ours

Change-Id: I410469bbc17d29a091b1e7134b1122e82c50f3ab

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 00:39:28 +0000 (00:39 +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
am: 2f50c14e1a -s ours

Change-Id: Idae568ac935dd35ea332b6acd875cf75a08e4e52

commit | commitdiff | tree

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

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 00:31:21 +0000 (00:31 +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
am: 1a19cb4e10 -s ours

Change-Id: Ied950cf003ce824db04013fb37593c844090e92a

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 27 Jul 2017 00:23:23 +0000 (00:23 +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 am: e0a07a210d -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

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

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 00:16:06 +0000 (00:16 +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
am: e0a07a210d -s ours

Change-Id: I8fa1bb157ad4645a0a02288f5e40416c75cdc26c

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 00:11:46 +0000 (00:11 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9724569903 -s ours am: 18b818e2dd -s ours am: 126d4923f4 -s ours" into oc-dr1-dev-plus-aosp
am: 1c2d7c336b -s ours

Change-Id: I850ffe8ef0735f0a99440aa3acb04912b332ee19

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 00:06:16 +0000 (00:06 +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
am: 7000298687 -s ours

Change-Id: Ie103f387cf0b1acd0fb0e4ad385fef3846d568c8

commit | commitdiff | tree

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

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 23:55:32 +0000 (23:55 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602 -s ours am: aec51f497c -s ours
am: a204358b18 -s ours

Change-Id: I70f15fc4332019f5bdfb21a7f092be8c968b438e

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 26 Jul 2017 23:52:26 +0000 (23:52 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9724569903 -s ours am: 18b818e2dd -s ours am: 126d4923f4 -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 23:48:31 +0000 (23:48 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9724569903 -s ours am: 18b818e2dd -s ours
am: 126d4923f4 -s ours

Change-Id: I86fa807f86727c28e368370db742300947711e32

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 23:42:57 +0000 (23:42 +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: I887e494fc178972d6941f5c8cbfe64fb0109dd0e

commit | commitdiff | tree

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

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 23:38:01 +0000 (23:38 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602 -s ours
am: aec51f497c -s ours

Change-Id: I2f855bb13f287547ab5f42c05dada215465d0e5c

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 23:34:30 +0000 (23:34 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9724569903 -s ours
am: 18b818e2dd -s ours

Change-Id: Ia30698cfb205b69d5d954ec4f9405fa228aa572e

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Aurimas Liutikas [Wed, 26 Jul 2017 22:36:59 +0000 (22:36 +0000)]

Merge "Revert "Update overscroll and toast UI"" into oc-dr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 22:14:51 +0000 (22:14 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 22:13:05 +0000 (22:13 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 21:59:35 +0000 (21:59 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 21:48:22 +0000 (21:48 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 21:36:36 +0000 (21:36 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Fyodor Kupolov [Wed, 26 Jul 2017 20:50:47 +0000 (20:50 +0000)]

Merge "Tests for lookaside configuration" into oc-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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