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

Dianne Hackborn [Wed, 2 Aug 2017 18:21:32 +0000 (18:21 +0000)]

Merge "Always report a uid's initial cached state." into oc-mr1-dev am: c134dec17f
am: fe7ff804be

Change-Id: I321ab463b66166bebb68389dfb0e03055667ccd2

commit | commitdiff | tree

Dianne Hackborn [Wed, 2 Aug 2017 18:14:26 +0000 (18:14 +0000)]

Merge "Improve docs about exceptions through Binder." into oc-mr1-dev am: 6e3af279ab
am: 5a0d703564

Change-Id: I45a971a83f6431e3d9b00c83a2abfd734d3f547f

commit | commitdiff | tree

Chad Brubaker [Wed, 2 Aug 2017 18:12:02 +0000 (18:12 +0000)]

Merge "Add owners for the network security config" am: 8773730cd9 am: e9d50c793a am: 531f1af615 am: 5813bc2b22
am: 13c192f9a1

Change-Id: I6d27a5b1e90333e0db5e94f68f273e758031f9c6

commit | commitdiff | tree

Adrian Roos [Wed, 2 Aug 2017 18:10:21 +0000 (18:10 +0000)]

Merge "LightStatus: Fix notification icon color filter" into oc-dr1-dev am: 6134b7529b am: f4a92fa5ce
am: 92ae73c22b

Change-Id: I21725b58ec3b986aa75965618aef0daa2ce3272b

commit | commitdiff | tree

Dianne Hackborn [Wed, 2 Aug 2017 18:02:12 +0000 (18:02 +0000)]

Merge "Always report a uid's initial cached state." into oc-mr1-dev
am: c134dec17f

Change-Id: I5a981e0483a723be7d8fdc22d9b052a97dbb422d

commit | commitdiff | tree

Dianne Hackborn [Wed, 2 Aug 2017 17:59:17 +0000 (17:59 +0000)]

Merge "Improve docs about exceptions through Binder." into oc-mr1-dev
am: 6e3af279ab

Change-Id: Ia69e8ed7db5210284fbfea95be2a2b0a7c6e3052

commit | commitdiff | tree

Selim Cinek [Wed, 2 Aug 2017 17:57:16 +0000 (17:57 +0000)]

Merge "Fixed an issue where icons were jumping" into oc-dr1-dev am: 7a719ab0ed am: db6902f7ff
am: 19e15baedf

Change-Id: If852247cde0592bc3b4223b59b650c4dd5c9b9ba

commit | commitdiff | tree

Adrian Roos [Wed, 2 Aug 2017 17:55:21 +0000 (17:55 +0000)]

Merge "LightStatus: Fix notification icon color filter" into oc-dr1-dev am: 6134b7529b am: c1c890d7fa
am: 29e698f274

Change-Id: Ibd6ed4a432c5a38791f72a282e307213cc5f620b

commit | commitdiff | tree

Selim Cinek [Wed, 2 Aug 2017 17:52:51 +0000 (17:52 +0000)]

Merge "Fixed an issue where icons were jumping" into oc-dr1-dev am: 7a719ab0ed am: 83aa001adf
am: b66a076820

Change-Id: I92b801e8dc67f808e99bb1c93c5793c20f80fd2a

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 17:51:48 +0000 (17:51 +0000)]

Merge "Always report a uid's initial cached state." into oc-mr1-dev

commit | commitdiff | tree

Chad Brubaker [Wed, 2 Aug 2017 17:51:46 +0000 (17:51 +0000)]

Merge "Add owners for the network security config" am: 8773730cd9 am: e9d50c793a am: 531f1af615
am: 5813bc2b22

Change-Id: I649c914986c16b5594219425a391c03e0a9b4390

commit | commitdiff | tree

Dianne Hackborn [Wed, 2 Aug 2017 17:51:01 +0000 (17:51 +0000)]

Merge "Improve docs about exceptions through Binder." into oc-mr1-dev

commit | commitdiff | tree

Adrian Roos [Wed, 2 Aug 2017 17:45:13 +0000 (17:45 +0000)]

Merge "LightStatus: Fix notification icon color filter" into oc-dr1-dev am: 6134b7529b
am: f4a92fa5ce

Change-Id: Ide9bc1a3b8dae01db77b1faf3c2a05b7f3548aec

commit | commitdiff | tree

Sundong Ahn [Wed, 2 Aug 2017 17:43:02 +0000 (17:43 +0000)]

Merge "Merge "Merge "Add hwbinder library" am: 49e2a9a612 am: 811027ede7 am: 2785be7572" into oc-dr1-dev-plus-aosp am: a4fb234a4c" into oc-mr1-dev-plus-aosp
am: 577653628b

Change-Id: Iea878b7dd7873e5c818afd34b0a035b38cc44db9

commit | commitdiff | tree

Selim Cinek [Wed, 2 Aug 2017 17:42:21 +0000 (17:42 +0000)]

Merge "Fixed an issue where icons were jumping" into oc-dr1-dev am: 7a719ab0ed
am: db6902f7ff

Change-Id: Id639f01a3969851294bfcd6746b84bac579da0f7

commit | commitdiff | tree

Chad Brubaker [Wed, 2 Aug 2017 17:41:21 +0000 (17:41 +0000)]

Merge "Add owners for the network security config" am: 8773730cd9 am: e9d50c793a
am: 531f1af615

Change-Id: I77240a60f796c63acd640b8a43cb7054ad2a8bee

commit | commitdiff | tree

Adrian Roos [Wed, 2 Aug 2017 17:38:02 +0000 (17:38 +0000)]

Merge "LightStatus: Fix notification icon color filter" into oc-dr1-dev am: 6134b7529b
am: c1c890d7fa

Change-Id: Ib387e9a44e78c7344b6c3efca01302c4aa77483a

commit | commitdiff | tree

Selim Cinek [Wed, 2 Aug 2017 17:36:03 +0000 (17:36 +0000)]

Merge "Fixed an issue where icons were jumping" into oc-dr1-dev am: 7a719ab0ed
am: 83aa001adf

Change-Id: Id8399a6fed722da7057c21e23981bc6925d72e7d

commit | commitdiff | tree

Dake Gu [Wed, 2 Aug 2017 17:34:16 +0000 (17:34 +0000)]

Merge "View: fix setTransientState" into oc-mr1-dev am: 8eb3a3979f
am: 8701a3231b

Change-Id: Id7c933c23d472184ff7d8b91d1587bcb0853207e

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 17:32:43 +0000 (17:32 +0000)]

Merge "services.core: remove use of -static hidl java" into oc-dr1-dev-plus-aosp am: 3750937e70
am: 5a37624e4a

Change-Id: I9fef0f8d0f5cebb546f371ac533521d88759f352

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 17:32:08 +0000 (17:32 +0000)]

Merge "Merge "Merge "Add hwbinder library" am: 49e2a9a612 am: 811027ede7 am: 2785be7572" into oc-dr1-dev-plus-aosp am: a4fb234a4c" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Adrian Roos [Wed, 2 Aug 2017 17:31:17 +0000 (17:31 +0000)]

Merge "LightStatus: Fix notification icon color filter" into oc-dr1-dev
am: 6134b7529b

Change-Id: I0f6b682d53f764c93d1c1c48490cf1427857b1b4

commit | commitdiff | tree

Adrian Roos [Wed, 2 Aug 2017 17:30:33 +0000 (17:30 +0000)]

Merge "LightStatus: Fix notification icon color filter" into oc-dr1-dev
am: 6134b7529b

Change-Id: Ib68dcc833b2a25466b147e8c406fa6bbd8517e02

commit | commitdiff | tree

Dake Gu [Wed, 2 Aug 2017 17:27:53 +0000 (17:27 +0000)]

Merge "View: fix setTransientState" into oc-mr1-dev
am: 8eb3a3979f

Change-Id: I85950ec6275c2d10bd0e9b7f030fa5ce2c66130c

commit | commitdiff | tree

Chad Brubaker [Wed, 2 Aug 2017 17:27:51 +0000 (17:27 +0000)]

Merge "Add owners for the network security config" am: 8773730cd9
am: e9d50c793a

Change-Id: Id183ac68171c94d082c992bd3e986c136d6c7764

commit | commitdiff | tree

Selim Cinek [Wed, 2 Aug 2017 17:27:48 +0000 (17:27 +0000)]

Merge "Fixed an issue where icons were jumping" into oc-dr1-dev
am: 7a719ab0ed

Change-Id: I5e983a7275e1dc117c1c70d6ae7be14b121d5c54

commit | commitdiff | tree

Selim Cinek [Wed, 2 Aug 2017 17:27:46 +0000 (17:27 +0000)]

Merge "Fixed an issue where icons were jumping" into oc-dr1-dev
am: 7a719ab0ed

Change-Id: I145e868610a92ba1af501c62b151c7f55663bec3

commit | commitdiff | tree

Sundong Ahn [Wed, 2 Aug 2017 17:27:38 +0000 (17:27 +0000)]

Merge "Merge "Add hwbinder library" am: 49e2a9a612 am: 811027ede7 am: 2785be7572" into oc-dr1-dev-plus-aosp
am: a4fb234a4c

Change-Id: I026ca8c33ef2fce7d40e2daec8db970d6b578f25

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 17:23:53 +0000 (17:23 +0000)]

Merge "services.core: remove use of -static hidl java" into oc-dr1-dev-plus-aosp
am: 3750937e70

Change-Id: I58257cf8a3f97ffec4cfef3a58ab8b87194295ea

commit | commitdiff | tree

Adrian Roos [Wed, 2 Aug 2017 17:23:31 +0000 (17:23 +0000)]

Merge "LightStatus: Fix notification icon color filter" into oc-dr1-dev

commit | commitdiff | tree

Chad Brubaker [Wed, 2 Aug 2017 17:20:16 +0000 (17:20 +0000)]

Merge "Add owners for the network security config"
am: 8773730cd9

Change-Id: I18b8aac4c1ac85bde3e6735e1afe6375f5c0e177

commit | commitdiff | tree

Stan Iliev [Wed, 2 Aug 2017 17:19:27 +0000 (17:19 +0000)]

Merge "Delete dead code function SpotShadow::makeClockwise" am: 8c9e5c81ad am: 98eaf41eec am: fb3f29b608 am: ccd3121379
am: 18e6f9c8ee

Change-Id: Id564f185689b3b9cd023d9467c664796ba7522ec

commit | commitdiff | tree

Dake Gu [Wed, 2 Aug 2017 17:18:00 +0000 (17:18 +0000)]

Merge "View: fix setTransientState" into oc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 17:16:57 +0000 (17:16 +0000)]

Merge "Merge "Add hwbinder library" am: 49e2a9a612 am: 811027ede7 am: 2785be7572" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 17:16:18 +0000 (17:16 +0000)]

Merge "Fixed an issue where icons were jumping" into oc-dr1-dev

commit | commitdiff | tree

Sundong Ahn [Wed, 2 Aug 2017 17:14:55 +0000 (17:14 +0000)]

Merge "Add hwbinder library" am: 49e2a9a612 am: 811027ede7
am: 2785be7572

Change-Id: Ia545b163166465cafa3d4ecbb0a5d0d911224b22

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 17:14:31 +0000 (17:14 +0000)]

Merge "services.core: remove use of -static hidl java" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Stan Iliev [Wed, 2 Aug 2017 17:10:57 +0000 (17:10 +0000)]

Merge "Delete dead code function SpotShadow::makeClockwise" am: 8c9e5c81ad am: 98eaf41eec am: fb3f29b608
am: ccd3121379

Change-Id: I4f96e688549840198dee57cd85c4362d23e564d8

commit | commitdiff | tree

Treehugger Robot [Wed, 2 Aug 2017 17:10:11 +0000 (17:10 +0000)]

Merge "Add owners for the network security config"

commit | commitdiff | tree

Sundong Ahn [Wed, 2 Aug 2017 17:05:56 +0000 (17:05 +0000)]

Merge "Add hwbinder library" am: 49e2a9a612
am: 811027ede7

Change-Id: Idec0d080a65d96ff866969f47e9902e40e800fdf

commit | commitdiff | tree

Stan Iliev [Wed, 2 Aug 2017 17:01:17 +0000 (17:01 +0000)]

Merge "Delete dead code function SpotShadow::makeClockwise" am: 8c9e5c81ad am: 98eaf41eec
am: fb3f29b608

Change-Id: I29cbdb6b741f0e4d84a12269607cdd32c6a51a74

commit | commitdiff | tree

Sundong Ahn [Wed, 2 Aug 2017 16:57:50 +0000 (16:57 +0000)]

Merge "Add hwbinder library"
am: 49e2a9a612

Change-Id: I3c7528dcf98bf3b92843594172531fd30a5f29d4

commit | commitdiff | tree

Stan Iliev [Wed, 2 Aug 2017 16:52:20 +0000 (16:52 +0000)]

Merge "Delete dead code function SpotShadow::makeClockwise" am: 8c9e5c81ad
am: 98eaf41eec

Change-Id: I3760a36d915f495fe8d4e457982440ff61934a6b

commit | commitdiff | tree

Treehugger Robot [Wed, 2 Aug 2017 16:46:42 +0000 (16:46 +0000)]

Merge "Add hwbinder library"

commit | commitdiff | tree

Stan Iliev [Wed, 2 Aug 2017 16:44:22 +0000 (16:44 +0000)]

Merge "Delete dead code function SpotShadow::makeClockwise"
am: 8c9e5c81ad

Change-Id: I5d696089e13dc68115451c223646ef5e0688b330

commit | commitdiff | tree

Felipe Leme [Wed, 2 Aug 2017 16:31:46 +0000 (16:31 +0000)]

Merge "Merge "Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am: c8f0fd7076 am: 6f9f17475d" into oc-dr1-dev-plus-aosp am: e3e338ed08" into oc-mr1-dev-plus-aosp
am: 71aebd1b25

Change-Id: I336989ba5e3cd6a3bfe7da0ba624f368352731ad

commit | commitdiff | tree

Felipe Leme [Wed, 2 Aug 2017 16:29:47 +0000 (16:29 +0000)]

Merge "Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am: c8f0fd7076 am: 32d4e30778 am: 23123ece60" into oc-mr1-dev-plus-aosp
am: f547615eae

Change-Id: I4b1c21c469eac345281b07601aa053f7d5665b7a

commit | commitdiff | tree

Treehugger Robot [Wed, 2 Aug 2017 16:29:23 +0000 (16:29 +0000)]

Merge "Delete dead code function SpotShadow::makeClockwise"

commit | commitdiff | tree

Felipe Leme [Wed, 2 Aug 2017 16:27:30 +0000 (16:27 +0000)]

Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am: c8f0fd7076 am: 32d4e30778 am: d25050e2a4
am: 7b6cdb061a

Change-Id: I6d63b4c98d1da0ca03aab3efde14d3ebba8ecf0c

commit | commitdiff | tree

Garry Boyer [Wed, 2 Aug 2017 16:25:34 +0000 (16:25 +0000)]

Merge "Revert multi-package APK flag to off."

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 16:24:55 +0000 (16:24 +0000)]

Merge "Make ellipsize retry if text doesn't fit"

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 16:22:16 +0000 (16:22 +0000)]

commit | commitdiff | tree

Felipe Leme [Wed, 2 Aug 2017 16:20:40 +0000 (16:20 +0000)]

Merge "Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am: c8f0fd7076 am: 6f9f17475d" into oc-dr1-dev-plus-aosp
am: e3e338ed08

Change-Id: Id8f0b1623ed9b268d3cd45521a5e9965b8e3feeb

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 16:20:03 +0000 (16:20 +0000)]

Merge "Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am: c8f0fd7076 am: 32d4e30778 am: 23123ece60" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Felipe Leme [Wed, 2 Aug 2017 16:17:40 +0000 (16:17 +0000)]

Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am: c8f0fd7076 am: 32d4e30778
am: 23123ece60

Change-Id: I57fc9c13849c9e8ed8960fddbac888a19ad40924

commit | commitdiff | tree

Felipe Leme [Wed, 2 Aug 2017 16:17:39 +0000 (16:17 +0000)]

Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am: c8f0fd7076 am: 32d4e30778
am: d25050e2a4

Change-Id: I46463fe043ce8e008a4587bba80c2a48c029fed9

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 16:11:30 +0000 (16:11 +0000)]

Merge "Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am: c8f0fd7076 am: 6f9f17475d" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Felipe Leme [Wed, 2 Aug 2017 16:09:58 +0000 (16:09 +0000)]

Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am: c8f0fd7076
am: 6f9f17475d

Change-Id: Ic1c671be822007e3d0493385e5ceba60f921b607

commit | commitdiff | tree

Felipe Leme [Wed, 2 Aug 2017 16:09:20 +0000 (16:09 +0000)]

Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am: c8f0fd7076
am: 32d4e30778

Change-Id: I5e3eff32fe5224d69bb41c4c4c48b880bc701c4b

commit | commitdiff | tree

Felipe Leme [Wed, 2 Aug 2017 16:09:13 +0000 (16:09 +0000)]

Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am: c8f0fd7076
am: 32d4e30778

Change-Id: I8de50b81273e89298a6276d8b17100c90361380e

commit | commitdiff | tree

Felipe Leme [Wed, 2 Aug 2017 16:00:41 +0000 (16:00 +0000)]

Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev
am: c8f0fd7076

Change-Id: Ida9652bb511ea0aa180e649992a9e5fa6409b2be

commit | commitdiff | tree

Felipe Leme [Wed, 2 Aug 2017 16:00:39 +0000 (16:00 +0000)]

Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev
am: c8f0fd7076

Change-Id: I3a2419aa6244f01a54211ab60558cc729c29249e

commit | commitdiff | tree

Felipe Leme [Wed, 2 Aug 2017 15:52:05 +0000 (15:52 +0000)]

Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 15:47:36 +0000 (15:47 +0000)]

Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master am: 7d7c269944 am: 81972a18e4 am: 795bcc5b75
am: c64c642e14

Change-Id: I7815db015b05c148ec7b62783a4843e0a4c04e90

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 15:38:40 +0000 (15:38 +0000)]

Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master am: 7d7c269944 am: 81972a18e4
am: 795bcc5b75

Change-Id: I6ef4e3b5c44272f5f0a8d585afea15a901178d2a

commit | commitdiff | tree

Bill Yi [Wed, 2 Aug 2017 15:38:35 +0000 (15:38 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: e5ae77c679 -s ours
am: 2ef5de5dda -s ours

Change-Id: Iebd1a2a9787104ffa33a0aaf06157f89655959f9

commit | commitdiff | tree

Bill Yi [Wed, 2 Aug 2017 15:30:44 +0000 (15:30 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: e5ae77c679 -s ours

Change-Id: I40363a8dfa67eeb76bcef16a239a753582e94edd

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 15:30:37 +0000 (15:30 +0000)]

Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master am: 7d7c269944
am: 81972a18e4

Change-Id: Id008ba3508c972d8d27eebca22009b4823e387e0

commit | commitdiff | tree

Todd Kennedy [Wed, 2 Aug 2017 15:27:06 +0000 (15:27 +0000)]

Merge "Fix deadlock between AMS and EphemeralResolverConnection" into oc-mr1-dev am: a3735dc42e
am: 7a8c6a39f5

Change-Id: I1d9e4b8d4aec4f9a81d5a0a4d0d520327321f79f

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 15:22:09 +0000 (15:22 +0000)]

Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master
am: 7d7c269944

Change-Id: Ie9058f2b554d2d88d31b4bc66ac56d4bf735704d

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 15:20:57 +0000 (15:20 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

commit | commitdiff | tree

Todd Kennedy [Wed, 2 Aug 2017 15:16:23 +0000 (15:16 +0000)]

Merge "Fix deadlock between AMS and EphemeralResolverConnection" into oc-mr1-dev
am: a3735dc42e

Change-Id: I9698b051ffd874692476419bfd7a4bb115ec6ef7

commit | commitdiff | tree

Bill Yi [Wed, 2 Aug 2017 15:14:01 +0000 (15:14 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 9f38e0f5e7 -s ours
am: d848c25c8d -s ours

Change-Id: I9f3e1aa8317c2fab5bca1b8af67e746ecc6fd7a4

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 15:08:37 +0000 (15:08 +0000)]

Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master

commit | commitdiff | tree

Bill Yi [Wed, 2 Aug 2017 15:04:55 +0000 (15:04 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 9f38e0f5e7 -s ours

Change-Id: I63a334e79ffeff50a02e1a428cfa8b9c6ceae4fa

commit | commitdiff | tree

Todd Kennedy [Wed, 2 Aug 2017 14:59:19 +0000 (14:59 +0000)]

Merge "Fix deadlock between AMS and EphemeralResolverConnection" into oc-mr1-dev

commit | commitdiff | tree

Bill Yi [Wed, 2 Aug 2017 14:58:44 +0000 (14:58 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Adrian Roos [Wed, 2 Aug 2017 14:57:11 +0000 (16:57 +0200)]

LightStatus: Fix notification icon color filter

Fixes an issue with the color filter applied to status bar icons where the
tint's alpha channel was ignored.

Change-Id: Idf22c70524fb718995d09ef339b825425ca5f7a7
Fixes: 64139391
Test: Look at light status bar with notifications; verify that icons have slightly gray tint instead of fully black

commit | commitdiff | tree

Bill Yi [Wed, 2 Aug 2017 14:56:51 +0000 (14:56 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Bill Yi [Wed, 2 Aug 2017 14:54:16 +0000 (14:54 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9ce641fd81 -s ours am: 5a4b06803d -s ours
am: eaff05d66a -s ours

Change-Id: Ic9184bc02b04417c7b338e13bfc1ddddb723b49d

commit | commitdiff | tree

Bill Yi [Wed, 2 Aug 2017 14:52:34 +0000 (14:52 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9ce641fd81 -s ours am: 0c411c32cd -s ours
am: ff70153aa4 -s ours

Change-Id: I5e5581e6432da36638b2092c9dbef4f40ddc1c1b

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 14:49:10 +0000 (14:49 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

commit | commitdiff | tree

Bill Yi [Wed, 2 Aug 2017 14:46:00 +0000 (14:46 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9ce641fd81 -s ours
am: 5a4b06803d -s ours

Change-Id: I00ea5acfa526d81275424043bccb3455fd0d0d1b

commit | commitdiff | tree

Todd Kennedy [Wed, 2 Aug 2017 14:43:36 +0000 (14:43 +0000)]

Merge "Add new API to retrieve app names in a batch" into oc-mr1-dev am: 5e049eb884
am: a1cb029caf

Change-Id: I9454b85835e0deb8264f7371748aad90cf04a42d

commit | commitdiff | tree

Bill Yi [Wed, 2 Aug 2017 14:41:02 +0000 (14:41 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9ce641fd81 -s ours
am: 0c411c32cd -s ours

Change-Id: Icb98d17a57ee254b3a5d3df7b4eee7332e14c35f

commit | commitdiff | tree

Bill Yi [Wed, 2 Aug 2017 14:36:03 +0000 (14:36 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 9ce641fd81 -s ours

Change-Id: I35fdc137ba9f079e4d632d2e62c5aacbb83e9ec4

commit | commitdiff | tree

Bill Yi [Wed, 2 Aug 2017 14:35:59 +0000 (14:35 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 9ce641fd81 -s ours

Change-Id: I1dff9545bf7cc357ef8d3bac8954d59c0c23b5c4

commit | commitdiff | tree

Todd Kennedy [Wed, 2 Aug 2017 14:33:09 +0000 (14:33 +0000)]

Merge "Add new API to retrieve app names in a batch" into oc-mr1-dev
am: 5e049eb884

Change-Id: I27542404b197a9d11d611d95f271660856271d40

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 14:25:24 +0000 (14:25 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

commit | commitdiff | tree

Todd Kennedy [Wed, 2 Aug 2017 14:23:16 +0000 (14:23 +0000)]

Merge "Add new API to retrieve app names in a batch" into oc-mr1-dev

commit | commitdiff | tree

Jorim Jaggi [Wed, 2 Aug 2017 12:42:52 +0000 (12:42 +0000)]

Merge "Merge "Refine condition for starting window skip" into oc-dr1-dev am: 612de053b8 am: cf538b382a" into oc-mr1-dev-plus-aosp
am: 013027ce3d

Change-Id: Idf558d46f97e72d6f2056845390adb9e8ef13870

commit | commitdiff | tree

Jorim Jaggi [Wed, 2 Aug 2017 12:41:03 +0000 (12:41 +0000)]

Merge "Refine condition for starting window skip" into oc-dr1-dev am: 612de053b8 am: 7269de217e
am: 0c4d9deb7c

Change-Id: If81a3f68da4f8e9ac585e7e1cdc7b1fdc8421304

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 12:34:29 +0000 (12:34 +0000)]

Merge "Merge "Refine condition for starting window skip" into oc-dr1-dev am: 612de053b8 am: cf538b382a" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jorim Jaggi [Wed, 2 Aug 2017 12:32:27 +0000 (12:32 +0000)]

Merge "Refine condition for starting window skip" into oc-dr1-dev am: 612de053b8
am: cf538b382a

Change-Id: Ia7c5f062b34475630817fefe5fc7ab68f4e0cdaf

commit | commitdiff | tree

Jorim Jaggi [Wed, 2 Aug 2017 12:32:24 +0000 (12:32 +0000)]

Merge "Refine condition for starting window skip" into oc-dr1-dev am: 612de053b8
am: 7269de217e

Change-Id: I1b5517489afa3da6c767bea99122a7c7fa05c3a1

commit | commitdiff | tree

Jorim Jaggi [Wed, 2 Aug 2017 12:23:06 +0000 (12:23 +0000)]

Merge "Refine condition for starting window skip" into oc-dr1-dev
am: 612de053b8

Change-Id: I9147082d4776b451b487c74785af9df9e2590ca3

commit | commitdiff | tree

Jorim Jaggi [Wed, 2 Aug 2017 12:22:58 +0000 (12:22 +0000)]

Merge "Refine condition for starting window skip" into oc-dr1-dev
am: 612de053b8

Change-Id: I687dad0a2177c8235e0a2acfd574a92a2a5cd6bb

commit | commitdiff | tree

Jorim Jaggi [Wed, 2 Aug 2017 12:15:40 +0000 (12:15 +0000)]

Merge "Refine condition for starting window skip" into oc-dr1-dev

commit | commitdiff | tree

Benjamin Franz [Wed, 2 Aug 2017 11:26:48 +0000 (11:26 +0000)]

Merge "Add unit tests to ActivityStarterInterceptor"

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 09:13:31 +0000 (09:13 +0000)]

Merge "Notify the user and turn off tethering when the service is disallowed."