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

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

commit | commitdiff | tree

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

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

Change-Id: I8fcea60d72018c6862df946aa3f23003c7a1e2e3

commit | commitdiff | tree

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

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

Change-Id: Id1e3d6bf1b8ee10ae0f3e23d685f50c311fd9c5f

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 23:07:15 +0000 (23:07 +0000)]

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

Change-Id: I2e44c8c1280d8b4d7cdb894d6d1affdf79e08955

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 22:58:37 +0000 (22:58 +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: I7b1e4d157af0263064fc7de6e717c8804616f216

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

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: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:39 +0000 (22:41 +0000)]

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

Change-Id: Id2a950d1ed41f79392e7c3292a0e87f7f1fad267

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:39:36 +0000 (22:39 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9bc30ce545 -s ours
am: 611a6ffe29 -s ours

Change-Id: I75b98556e45e2dfa5834d11c4c7a96e447d7d134

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 22:37:13 +0000 (22:37 +0000)]

Import translations. DO NOT MERGE am: 495d4ce1b9 -s ours
am: 120c3e9874 -s ours

Change-Id: Ie39ae7739ca7defdb6b7e6f8a992c36ede26e90f

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

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

Bill Yi [Wed, 26 Jul 2017 22:21:32 +0000 (22:21 +0000)]

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

Change-Id: Ib331eb4cf8882b271b11b756c43818a5b38c1664

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 22:16:34 +0000 (22:16 +0000)]

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

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

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

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

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

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

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

TreeHugger Robot [Wed, 26 Jul 2017 20:37:49 +0000 (20:37 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 20:24:09 +0000 (20:24 +0000)]

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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 20:17:32 +0000 (20:17 +0000)]

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

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 18:03:33 +0000 (11:03 -0700)]

Import translations. DO NOT MERGE

Change-Id: I228aaf428e6298a9077e8f277c3e6e26b5ebd7a3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 18:02:05 +0000 (11:02 -0700)]

Import translations. DO NOT MERGE

Change-Id: I13f52e0726334b4ff47a780e3d5c41074d96aada
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 18:01:07 +0000 (11:01 -0700)]

Import translations. DO NOT MERGE

Change-Id: I8b8dd3e35096ba23f1dd7cc01beba7b392167591
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 18:00:00 +0000 (11:00 -0700)]

Import translations. DO NOT MERGE

Change-Id: Iebfe4076b754c857472076b3aa9d9fd0b491e6f7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:57:20 +0000 (10:57 -0700)]

Import translations. DO NOT MERGE

Change-Id: I9be29c557742c6c1d233376f49088bcb3309bfb3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:54:37 +0000 (10:54 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ib4dc70583403c24fd26d0e909577e13c22165482
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:49:37 +0000 (10:49 -0700)]

Import translations. DO NOT MERGE

Change-Id: I6ff93110716d74d81f968786a331295e110e0168
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:46:30 +0000 (10:46 -0700)]

Import translations. DO NOT MERGE

Change-Id: I1cfa4e4737d8fe82c6c39d1772d565c56ce186c4
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:42:20 +0000 (10:42 -0700)]

Import translations. DO NOT MERGE

Change-Id: I9273d1c9e96d398653e3846dcdfdf2df5a070a57
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:40:40 +0000 (10:40 -0700)]

Import translations. DO NOT MERGE

Change-Id: If6893b7757cc431a56096d7c708f600d3f2f8575
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:36:27 +0000 (10:36 -0700)]

Import translations. DO NOT MERGE

Change-Id: I788dbd4e193bfb2bae69e37fd18becd482a42917
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:23:59 +0000 (10:23 -0700)]

Import translations. DO NOT MERGE

Change-Id: I7a677eabfe97553a7bddecfa88064d5e4edd37b6
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:22:32 +0000 (10:22 -0700)]

Import translations. DO NOT MERGE

Change-Id: I845591a10b25b12451ddb1a6591b8b638630e32c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:15:09 +0000 (08:15 +0000)]

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

Change-Id: I38d271b4cce89a81e555f922210bf1be4829c1ba

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:07:09 +0000 (08:07 +0000)]

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

Change-Id: Idda516628b04350d3a7a11b443dda1b09573c869

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:03:37 +0000 (08:03 +0000)]

Import translations. DO NOT MERGE
am: 7c2b27f26f -s ours

Change-Id: Ica7795281f339697f1c8799cff244ecced0d4f9f

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 08:03:03 +0000 (08:03 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 07:53:12 +0000 (07:53 +0000)]

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

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 04:24:47 +0000 (21:24 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ie81e9b6438034399af10f964876f14cb08b8ceb7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 04:17:50 +0000 (21:17 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ifd1d218d134f9871650b17254741c4a0b40a4f0d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 04:15:58 +0000 (21:15 -0700)]

Import translations. DO NOT MERGE

Change-Id: I0f6bf766d9d5d91f8b885e4ecc0878cacde1668f
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

David Friedman [Fri, 21 Jul 2017 23:11:14 +0000 (23:11 +0000)]

Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug: 34273998 Test: Ran "make" to verify error-free building." into oc-dev
am: e4d0557334

Change-Id: I05093bfc77bbddb959743f3fb8086510e44d8b20

commit | commitdiff | tree

David Friedman [Fri, 21 Jul 2017 23:01:56 +0000 (23:01 +0000)]

Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug: 34273998 Test: Ran "make" to verify error-free building." into oc-dev

commit | commitdiff | tree

Benjamin Miller [Thu, 20 Jul 2017 14:07:01 +0000 (14:07 +0000)]

Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev
am: baa85250d4

Change-Id: I621c6249c18d9919484b78f3b92e93092870bc22

commit | commitdiff | tree

Benjamin Miller [Thu, 20 Jul 2017 13:58:15 +0000 (13:58 +0000)]

Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev

commit | commitdiff | tree

Dave Friedman [Wed, 5 Jul 2017 07:40:07 +0000 (00:40 -0700)]

Docs: Updates guidance about using permissions when accessing OBB
expansion files,
Bug: 34273998
Test: Ran "make" to verify error-free building.

Change-Id: Ic2022bd8bd78e2f6077d6ee6807fbbda7214737a

commit | commitdiff | tree

Ricardo Loo [Wed, 19 Jul 2017 04:44:51 +0000 (04:44 +0000)]

Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev
am: 8e644a7510

Change-Id: I51aa7e1c4d294ef567212ebb6b445a2730289d66

commit | commitdiff | tree

Ricardo Loo [Wed, 19 Jul 2017 04:36:42 +0000 (04:36 +0000)]

Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 01:19:41 +0000 (01:19 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-mr1-dev am: 4a1dc3458d am: a84f7a3028 am: 72c56fb84a -s ours
am: ea6aaed42d

Change-Id: Ifee82294124da12b0114a543dc9ac90f313eaaa2

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 01:10:58 +0000 (01:10 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-mr1-dev am: 4a1dc3458d am: a84f7a3028
am: 72c56fb84a -s ours

Change-Id: Ib0b35737306bce22a49bddeea0d7abdc8ecb1bc3

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 01:01:06 +0000 (01:01 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-mr1-dev am: 4a1dc3458d
am: a84f7a3028

Change-Id: I1fedbee4642373e41c63c36ab83a0f4629c4a3d1

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 00:53:13 +0000 (00:53 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-mr1-dev
am: 4a1dc3458d

Change-Id: Ibc50787c078b4d68de37f12d57d4b14990b5c768

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 00:47:54 +0000 (00:47 +0000)]

Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4 am: 996bc6bc12 -s ours am: 9e39e1e548 am: afdcad0df3 am: edbe4bd86a am: 2da30457c5 am: d761dad216
am: a81076b2e8

Change-Id: I0352ea6c3822fa874fd27ef72f976a3cb8eec9af

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 00:46:42 +0000 (00:46 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-mr1-dev

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 00:42:05 +0000 (00:42 +0000)]

Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4 am: 996bc6bc12 -s ours am: 9e39e1e548 am: afdcad0df3 am: edbe4bd86a am: 2da30457c5
am: d761dad216

Change-Id: Ib2704ba352764d6f48467c129b2a2d4129408da0

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 00:30:58 +0000 (00:30 +0000)]

Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4 am: 996bc6bc12 -s ours am: 9e39e1e548 am: afdcad0df3 am: edbe4bd86a
am: 2da30457c5

Change-Id: If6d698d3d085c8a49a4b58ae5cc5005264558091

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 00:24:23 +0000 (00:24 +0000)]

Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4 am: 996bc6bc12 -s ours am: 9e39e1e548 am: afdcad0df3
am: edbe4bd86a

Change-Id: I860d4a27acab50bfebf81e83b3db64f7c396fade

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 00:15:34 +0000 (00:15 +0000)]

Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4 am: 996bc6bc12 -s ours am: 9e39e1e548
am: afdcad0df3

Change-Id: Ie777e6351ed8518a4fc785a20772a8e2cb0ef0fe

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 00:04:51 +0000 (00:04 +0000)]

Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4 am: 996bc6bc12 -s ours
am: 9e39e1e548

Change-Id: I04ba3782f29c89032d498c5e2ef292605a66ac9f

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 23:58:28 +0000 (23:58 +0000)]

Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4
am: 996bc6bc12 -s ours

Change-Id: Iccbeb4cec6e40c00e7f875b5e3faa94772f1b819

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 23:41:26 +0000 (23:41 +0000)]

Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714
am: 9625d164e4

Change-Id: I0aa09448467dae806c9c5670ba8ed77e95a59da1

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 23:35:25 +0000 (23:35 +0000)]

Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56
am: 0ddd7e4714

Change-Id: If39e3e66871aed33dfa0a9949cfd70a7ec45231f

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 23:28:55 +0000 (23:28 +0000)]

Merge "Back-port fixes for b/62196835" into mnc-dev
am: 093c7a8e56

Change-Id: I7f734c7878cf065d15335602f9b0a6e02a786d53

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 23:21:16 +0000 (23:21 +0000)]

Merge "Back-port fixes for b/62196835" into mnc-dev

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 22:33:40 +0000 (22:33 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c -s ours am: 2a93c3d390 am: fef2328f35 am: 713a5420dd
am: 80c2eeedbb

Change-Id: I495289e9b9c043151969e2a4b814d3708c65d905

commit | commitdiff | tree

Phil Weaver [Wed, 12 Jul 2017 21:04:16 +0000 (14:04 -0700)]

Back-port fixes for b/62196835

Bug: 62196835
Test: Created an accessibility service that displays a system
and a toast overlay, confirmed that it disappeared when we
reached the accessibility permission screen that uses this
flag.

Change-Id: Ic51ead670fc480e549512ba1d02f49d9c13bc3f0

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 22:26:36 +0000 (22:26 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c -s ours am: 2a93c3d390 am: fef2328f35
am: 713a5420dd

Change-Id: Ib3e9b5d8c8807a5e7f41f94d127008fc4f255f3e

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 22:19:02 +0000 (22:19 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c -s ours am: 2a93c3d390
am: fef2328f35

Change-Id: Ifc093c5a322bdb94717cfaebe9a9bab255e22789

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 22:15:24 +0000 (22:15 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours am: bbb567757f am: 27ad1fbc2c am: b2e3fb162f am: ac700bc3c7 am: cfbe89ad32 -s ours
am: 442fc85852

Change-Id: Ie4d7e78b0e45c383594f3fc6b2db2980d9339764

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 22:03:40 +0000 (22:03 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c -s ours
am: 2a93c3d390

Change-Id: I11d0935ed851e3c6076fb972a721d42e4903c6de

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 22:01:45 +0000 (22:01 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours am: f44b48acae am: aa8976fa69 am: 783253f6db am: d2c4007d8a am: 982cf0d212 -s ours
am: 4607ec8f6d

Change-Id: Iac0fdf4d9bab026112de4864d227e3894da192ef

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:59:29 +0000 (21:59 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours am: bbb567757f am: 27ad1fbc2c am: b2e3fb162f am: ac700bc3c7
am: cfbe89ad32 -s ours

Change-Id: I20741c5be51498f1d9a44452784fa59d31a12b2e

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:55:27 +0000 (21:55 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8
am: 4fa8b51c0c -s ours

Change-Id: I72897fd488d26ed7c3e1462c1755e10d2b7dfbe8

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:50:57 +0000 (21:50 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours am: bbb567757f am: 27ad1fbc2c am: b2e3fb162f
am: ac700bc3c7

Change-Id: If57bab0ee9d5459286339845284adb3f0163c401

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:50:05 +0000 (21:50 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours am: f44b48acae am: aa8976fa69 am: 783253f6db am: d2c4007d8a
am: 982cf0d212 -s ours

Change-Id: Ia2a716d38e67874beb146f12849dd2f3f1356903

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:46:25 +0000 (21:46 +0000)]

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c am: b968d99e3e am: a1dca32957 am: 79c476704f am: faded53018
am: 3700014be0

Change-Id: Ib0ab12f33da6a6a6f245fa4f2eab949becf42798

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:44:32 +0000 (21:44 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-dev
am: 0b0834fbe8

Change-Id: Ie3ade206625af7f69d497935397cd3094a1555fb

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:43:45 +0000 (21:43 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours am: f44b48acae am: aa8976fa69 am: 783253f6db
am: d2c4007d8a

Change-Id: I9c749eb931db880073de06259232f5f03c91cd32

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:40:14 +0000 (21:40 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours am: bbb567757f am: 27ad1fbc2c
am: b2e3fb162f

Change-Id: Ia38cf0592fed9cbf5e83a0163083bcd31d065e7e

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:27:11 +0000 (21:27 +0000)]

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c am: b968d99e3e am: a1dca32957 am: 79c476704f
am: faded53018

Change-Id: I2ba2b1380a91ee398ae65baa8b112bf9c3c3768c

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:27:06 +0000 (21:27 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours am: bbb567757f
am: 27ad1fbc2c

Change-Id: I5830c0f6d5377717e175c1c90360e0487ef37b42

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:24:29 +0000 (21:24 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours am: f44b48acae am: aa8976fa69
am: 783253f6db

Change-Id: Iad10dcb9d92660a20c5db0450da6edd3cc2df329

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:23:16 +0000 (21:23 +0000)]

Merge "Back-port fixes for b/62196835" into nyc-dev

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:18:42 +0000 (21:18 +0000)]

Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c am: b968d99e3e am: a1dca32957
am: 79c476704f

Change-Id: I38051f6f359f780d421384a01ac578f51ca13e63

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:18:16 +0000 (21:18 +0000)]

Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours
am: bbb567757f

Change-Id: I7b4397bda68b12219b7494948b8d021fa95f072b

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 21:14:49 +0000 (21:14 +0000)]

DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours am: f44b48acae
am: aa8976fa69

Change-Id: Iff6ad10a9704d09d00c693c074abbb3cd4e49c9e