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

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

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103 -s ours am: 995029b529 -s ours am: 1e8ed22be2 -s ours am: 9b16c7b2bb -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 01:29:40 +0000 (01:29 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103 -s ours am: 995029b529 -s ours am: 1e8ed22be2 -s ours
am: 9b16c7b2bb -s ours

Change-Id: I0932073613c853f44082f6e7df4e30324364cc68

commit | commitdiff | tree

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

Merge "Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602 -s ours am: aec51f497c -s ours am: b57520aae6 -s ours" into oc-dr1-dev-plus-aosp am: 0b190bd9cb -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 01:26:11 +0000 (01:26 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602 -s ours am: aec51f497c -s ours am: b57520aae6 -s ours" into oc-dr1-dev-plus-aosp
am: 0b190bd9cb -s ours

Change-Id: I1e3ad36dbf4006672487447f37bb7a65f694dc5e

commit | commitdiff | tree

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

Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66 -s ours am: 9cf9d294ef -s ours am: e2f2fbaea1 -s ours am: f417f591a1 -s ours" into oc-dr1-dev-plus-aosp am: b99a5acab9 -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

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

Merge "Merge "Checks if mResponses is null before using it." into oc-mr1-dev am: db3c4ee787" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 01:22:35 +0000 (01:22 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66 -s ours am: 9cf9d294ef -s ours am: e2f2fbaea1 -s ours am: f417f591a1 -s ours" into oc-dr1-dev-plus-aosp
am: b99a5acab9 -s ours

Change-Id: I94eb589508c4da7fd493f82ed264d53039d216d8

commit | commitdiff | tree

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

Merge "Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9724569903 -s ours am: 18b818e2dd -s ours am: 415ca774d7 -s ours" into oc-dr1-dev-plus-aosp am: 6d7c3b21e5 -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 01:19:39 +0000 (01:19 +0000)]

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

Change-Id: If01b16176d40862a6433fd000700656e944cdd5a

commit | commitdiff | tree

Felipe Leme [Thu, 27 Jul 2017 01:19:00 +0000 (01:19 +0000)]

Merge "Checks if mResponses is null before using it." into oc-mr1-dev
am: db3c4ee787

Change-Id: Ib68b6d112ead839b175751395a80afc515e532cf

commit | commitdiff | tree

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

Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 4ba2bc4d32 -s ours am: 8080362358 -s ours am: 0ceb3853e8 -s ours am: 7395db8492 -s ours" into oc-dr1-dev-plus-aosp am: b42dbfd109 -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

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

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103 -s ours am: 995029b529 -s ours am: 1e8ed22be2 -s ours am: 25b5ae7884 -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 01:17:05 +0000 (01:17 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 4ba2bc4d32 -s ours am: 8080362358 -s ours am: 0ceb3853e8 -s ours am: 7395db8492 -s ours" into oc-dr1-dev-plus-aosp
am: b42dbfd109 -s ours

Change-Id: Ie506ef27d7cfcc39fbd80c13310d28c13646d3a9

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 01:14:01 +0000 (01:14 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103 -s ours am: 995029b529 -s ours am: 1e8ed22be2 -s ours
am: 25b5ae7884 -s ours

Change-Id: Ic298a8cf26c9f0ce3bc09fa6cd3c3e64b2499fb1

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

Merge "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: 9b8f58319f -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 01:09:58 +0000 (01:09 +0000)]

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

Change-Id: Idf8b5511ceed88c3149c69b960b717c6b14f2345

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 01:07:22 +0000 (01:07 +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: 9b8f58319f -s ours

Change-Id: I2f4741d61294172cd0fc235e10adccbc0bb85471

commit | commitdiff | tree

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

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103 -s ours am: 995029b529 -s ours am: e861cf8791 -s ours am: 9d5cc8b67f -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 01:04:13 +0000 (01:04 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103 -s ours am: 995029b529 -s ours am: e861cf8791 -s ours
am: 9d5cc8b67f -s ours

Change-Id: I2e50d96db21378e2639f655f8b4b91be5aa06dfc

commit | commitdiff | tree

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

Merge "Merge "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" into oc-dr1-dev-plus-aosp am: a9ea1f2f65 -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

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

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 01:01:12 +0000 (01:01 +0000)]

Merge "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" into oc-dr1-dev-plus-aosp
am: a9ea1f2f65 -s ours

Change-Id: Id08edf929696faaf4055b1e7b5e8b04665e303a8

commit | commitdiff | tree

TreeHugger Robot [Thu, 27 Jul 2017 01:00:58 +0000 (01:00 +0000)]

Merge "Checks if mResponses is null before using it." into oc-mr1-dev

commit | commitdiff | tree

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: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

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

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

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:45:10 +0000 (00:45 +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: Ie174a36ad5952ec42926dbf033f6887f43a228d8

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

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

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602 -s ours am: aec51f497c -s ours am: b57520aae6 -s ours" into oc-dr1-dev-plus-aosp

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

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

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66 -s ours am: 9cf9d294ef -s ours am: e2f2fbaea1 -s ours am: f417f591a1 -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 00:36:55 +0000 (00:36 +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: Ia18d1bbc60892f9775bfc6484db97ee5750b9e9a

commit | commitdiff | tree

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

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

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:34:00 +0000 (00:34 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66 -s ours am: 9cf9d294ef -s ours am: e2f2fbaea1 -s ours
am: f417f591a1 -s ours

Change-Id: Icbfa0a014daa45c9e4fc198c25573dc861d733a6

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 00:33:13 +0000 (00:33 +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: I0427d5fcc7a93893de057175286ea44853a59ede

commit | commitdiff | tree

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

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 4ba2bc4d32 -s ours am: 8080362358 -s ours am: 0ceb3853e8 -s ours am: 7395db8492 -s ours" into oc-dr1-dev-plus-aosp

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

Bill Yi [Thu, 27 Jul 2017 00:29:36 +0000 (00:29 +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: I2a3b53c08a825b0b155351fa65efe3dfe4719511

commit | commitdiff | tree

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

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 4ba2bc4d32 -s ours am: 8080362358 -s ours am: 0ceb3853e8 -s ours
am: 7395db8492 -s ours

Change-Id: Icd4f161b981b49c1f50740168b78bf94d38a8aa1

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:18:45 +0000 (00:18 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66 -s ours am: 9cf9d294ef -s ours
am: e2f2fbaea1 -s ours

Change-Id: I28f04846c8494e19d0b04e96eaf0a8448e1fab43

commit | commitdiff | tree

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

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103 -s ours am: 995029b529 -s ours
am: e861cf8791 -s ours

Change-Id: I21a201b97f23604d927f39fa2f7e64365cb5d27e

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 00:16:17 +0000 (00:16 +0000)]

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

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

Merge "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" into oc-dr1-dev-plus-aosp

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

Bill Yi [Wed, 26 Jul 2017 23:54:36 +0000 (23:54 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 4ba2bc4d32 -s ours am: 8080362358 -s ours
am: 0ceb3853e8 -s ours

Change-Id: Idf42771340f4f8591ebc3b8e889798330147e7bb

commit | commitdiff | tree

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

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: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

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 23:44:16 +0000 (23:44 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103 -s ours
am: 995029b529 -s ours

Change-Id: Iea953c1a17f18528e1c3ae5b3663419745e88b79

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: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

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:07:26 +0000 (23:07 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66 -s ours
am: 9cf9d294ef -s ours

Change-Id: I559573199120374e303bfaae5d5c18660dbb369e

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" into cw-f-dev am: 4ba2bc4d32 -s ours
am: 8080362358 -s ours

Change-Id: I8243f6ee311cd730ace4f9bca4693ccdabfa7523

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:52:44 +0000 (22:52 +0000)]

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

Change-Id: Ife54f4e800fd4b81c5639984937096945f063d1d

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