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

Mark Lu [Sun, 31 Jul 2016 02:54:19 +0000 (02:54 +0000)]

Merge \\\\\"docs: fix escaped characters in data binding doc\\\\\" into nyc-docs am: 4172905146 am: 06c1159b0a am: 1fab755911 am: a2891ed4e3
am: 546bb7a11d

Change-Id: I9353de9ea17c5f897d5f876a71c8cbee039b552a

commit | commitdiff | tree

Mark Lu [Sun, 31 Jul 2016 02:54:17 +0000 (02:54 +0000)]

docs: fix escaped characters in data binding doc am: 011c07bd80 am: 494d775cde am: 2d19e4314a am: 2fa31f8e37
am: 57c053283b

Change-Id: I638125d507fb779812b2842a5b9f11529f4fd52b

commit | commitdiff | tree

Mark Lu [Sun, 31 Jul 2016 02:54:14 +0000 (02:54 +0000)]

Merge \"Merge \\\\"docs: fix escaped characters in data binding doc\\\\" into nyc-docs am: 4172905146 am: 06c1159b0a am: e6e257f46e\" into nyc-mr1-dev-plus-aosp
am: e9d678de9a

Change-Id: I3f61d417b86d7f38dd63e8020fa3b91be32d6c61

commit | commitdiff | tree

Mark Lu [Sun, 31 Jul 2016 02:54:12 +0000 (02:54 +0000)]

Merge \\\\"docs: fix escaped characters in data binding doc\\\\" into nyc-docs am: 4172905146 am: 06c1159b0a am: e6e257f46e
am: 70e9a816fa

Change-Id: Ib7a6c2616af9a73f601d2025a33ded0237122119

commit | commitdiff | tree

Mark Lu [Sun, 31 Jul 2016 02:54:04 +0000 (02:54 +0000)]

Merge \"docs: fix escaped characters in data binding doc am: 011c07bd80 am: 494d775cde am: ee15ca4437\" into nyc-mr1-dev-plus-aosp
am: 1a66c204a5

Change-Id: I89f984cf7ba8d224e1f38d38bb87a8df45a739ca

commit | commitdiff | tree

Mark Lu [Sun, 31 Jul 2016 02:54:01 +0000 (02:54 +0000)]

docs: fix escaped characters in data binding doc am: 011c07bd80 am: 494d775cde am: ee15ca4437
am: 051904462e

Change-Id: Ie66fae1de5e6a0716308a20b90331952b33d8a7b

commit | commitdiff | tree

Sungsoo Lim [Sun, 31 Jul 2016 02:51:24 +0000 (02:51 +0000)]

DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours am: e0316fc7a8 am: bfdf9592d0 am: 59cb7ab7b8 am: 49f14fa7e0 -s ours am: 53e9affbf9 am: 54dd962416 am: 56ff60b465
am: 079eabb0fd -s ours

Change-Id: I7c94560da514155e7f53be321dd231ebbabfe41d

commit | commitdiff | tree

Sungsoo Lim [Sun, 31 Jul 2016 02:51:21 +0000 (02:51 +0000)]

DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours am: e0316fc7a8 am: bfdf9592d0 am: 59cb7ab7b8 am: 49f14fa7e0 -s ours am: 53e9affbf9 am: 878abb9bf4
am: 59268fa678 -s ours

Change-Id: I3a5231fee239d881a9e22b0791519dfb8c4f42b4

commit | commitdiff | tree

Fyodor Kupolov [Sun, 31 Jul 2016 02:51:19 +0000 (02:51 +0000)]

Merge \\\"Cache package names after reboot\\\" into nyc-mr1-dev am: 77faae7282 am: 2c633e9b83
am: c91f7c371b

Change-Id: Iba8af448ec695ff41a48d76f87f5e49ce50e6f51

commit | commitdiff | tree

Fyodor Kupolov [Sun, 31 Jul 2016 02:51:16 +0000 (02:51 +0000)]

Cache package names after reboot am: 773e997432 am: 94387b55c9
am: 3f51273df4

Change-Id: Ie45cb158ecc30d7d95e277aee38a38bb88d3bdbd

commit | commitdiff | tree

Sungsoo Lim [Sun, 31 Jul 2016 02:51:12 +0000 (02:51 +0000)]

DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s ours am: 0bbdc37b60 am: 25782fae9b am: dd2ec80035 am: d056456fe2 -s ours am: cd17df0011 am: f3af9e5825 am: 6bcbe9a7aa
am: 0e7310757f -s ours

Change-Id: If65e230292773041871aaa201a86e72b91951c39

commit | commitdiff | tree

Sungsoo Lim [Sun, 31 Jul 2016 02:38:57 +0000 (02:38 +0000)]

DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s ours am: 0bbdc37b60 am: 25782fae9b am: dd2ec80035 am: d056456fe2 -s ours am: cd17df0011 am: ccad5a8f22
am: 5134870f94 -s ours

Change-Id: I284c23f0be96bb12018dec30c132c27c36609696

commit | commitdiff | tree

Sungsoo Lim [Sun, 31 Jul 2016 02:38:55 +0000 (02:38 +0000)]

Merge \"DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522 am: b04c428935 am: e71159c5f7 -s ours am: 204fdc49fc am: 58cf51abb7 am: 41d65fc3b8\" into nyc-mr1-dev-plus-aosp
am: 5f59a19c9a -s ours

Change-Id: Id1c9d9930b30fad11c28ed2f482ea3756bae2eb0

commit | commitdiff | tree

Sungsoo Lim [Sun, 31 Jul 2016 02:38:52 +0000 (02:38 +0000)]

DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522 am: b04c428935 am: e71159c5f7 -s ours am: 204fdc49fc am: 58cf51abb7 am: 41d65fc3b8
am: 5587ab03be -s ours

Change-Id: I75bf6bc450335662795cb36bd63d2a11afd6cc65

commit | commitdiff | tree

Philip P. Moltmann [Sun, 31 Jul 2016 02:38:42 +0000 (02:38 +0000)]

Merge \"Merge \\\"Handle reset of recommended services\\\" into nyc-mr1-dev am: 0922e6c652 am: 76ce382352\" into nyc-mr1-dev-plus-aosp
am: 680ef25daa

Change-Id: I862f6446a8c2fa6491765409904e292f33df736b

commit | commitdiff | tree

Philip P. Moltmann [Sun, 31 Jul 2016 02:38:39 +0000 (02:38 +0000)]

Merge \\\"Handle reset of recommended services\\\" into nyc-mr1-dev am: 0922e6c652 am: 76ce382352
am: 318384a0b1

Change-Id: Ic72ab4fb65cb46d2f3a6e0e80bd068dc0ce66e9d

commit | commitdiff | tree

Philip P. Moltmann [Sun, 31 Jul 2016 02:38:32 +0000 (02:38 +0000)]

Merge \"Handle reset of recommended services am: fe789f3189 am: bc11f26a09\" into nyc-mr1-dev-plus-aosp
am: 2d50db73c2

Change-Id: Icdb9c4b6fdce8744b2e93b5335cb0efc2ca1d76c

commit | commitdiff | tree

Philip P. Moltmann [Sun, 31 Jul 2016 02:38:29 +0000 (02:38 +0000)]

Handle reset of recommended services am: fe789f3189 am: bc11f26a09
am: 36d68891a5

Change-Id: I13f55cee79c6117f95c9fe8b268b64c654af90a0

commit | commitdiff | tree

Sungsoo Lim [Sun, 31 Jul 2016 02:38:21 +0000 (02:38 +0000)]

DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522 am: b04c428935 am: e71159c5f7 -s ours am: 204fdc49fc am: 4d90202dd3
am: d4feca33ed -s ours

Change-Id: I145e0083d69203272ff175c8a1ae9c6a63d97afc

commit | commitdiff | tree

Felipe Leme [Sun, 31 Jul 2016 02:28:32 +0000 (02:28 +0000)]

Merge \\\"Increased size of data_saver_enable_title.\\\" into nyc-mr1-dev am: c6655be308 am: af24aba45c
am: de93ed5f3f

Change-Id: Iab17a20513c6f153334c457e38fa765996ff9b37

commit | commitdiff | tree

Felipe Leme [Sun, 31 Jul 2016 02:28:29 +0000 (02:28 +0000)]

Increased size of data_saver_enable_title. am: 9b0e888ff9 am: ecf5a195d7
am: eb487056d1

Change-Id: I77d9f27584fd860e5d75c50befe3b9ad98f8001c

commit | commitdiff | tree

Phil Weaver [Sun, 31 Jul 2016 02:28:25 +0000 (02:28 +0000)]

Merge \\\"Prevent a11y seeing behind tasks w/modal windows.\\\" into nyc-mr1-dev am: a200e774e7 am: cf2477ddb4
am: 2ec83d5353

Change-Id: I45c4064e448194bbf4b7920211c996fa80e901df

commit | commitdiff | tree

Phil Weaver [Sun, 31 Jul 2016 02:28:23 +0000 (02:28 +0000)]

Prevent a11y seeing behind tasks w/modal windows. am: ac9ad70086 am: 7fb5fcc3a6
am: 08a03c0e2d

Change-Id: Iee5ddf5920abba13f6b7532ede99295d9aeaf0c8

commit | commitdiff | tree

Michael Kwan [Sun, 31 Jul 2016 02:28:20 +0000 (02:28 +0000)]

Merge \\"Resolve issues with AlertDialog layout for watch devices.\\" into cw-f-dev am: 03da42c94d
am: f85049dcb0

Change-Id: I1d2ac2496885e8f37acccf5e2c7b46b08a7e5828

commit | commitdiff | tree

Michael Kwan [Sun, 31 Jul 2016 02:25:53 +0000 (02:25 +0000)]

Resolve issues with AlertDialog layout for watch devices. am: 44ff1e1d13
am: 37cb57620d

Change-Id: I6a6b02b7aebfca73958a5d7531566aceac7f87f4

commit | commitdiff | tree

Makoto Onuki [Sun, 31 Jul 2016 02:25:48 +0000 (02:25 +0000)]

Merge \\\"LauncherApps should also throw when user is locked\\\" into nyc-mr1-dev am: ba933b39ae am: 5e9d23dbd6
am: d9c0ed997a

Change-Id: I871786a03242023138b9c3fe7363e16e7d8543dd

commit | commitdiff | tree

Makoto Onuki [Sun, 31 Jul 2016 02:25:45 +0000 (02:25 +0000)]

LauncherApps should also throw when user is locked am: bc4ad85d29 am: 5ec63fc3c7
am: 3b5920b2a1

Change-Id: I60beb409a55297a9a2adaaf52f1ea1e185668c88

commit | commitdiff | tree

Fei Wu [Sun, 31 Jul 2016 02:25:42 +0000 (02:25 +0000)]

Merge \\"Optimize animation of watch switch thumb\\" into cw-f-dev am: 88ee6c8a37
am: f99a41ac13

Change-Id: I0d66b3dd06fa99583fe608003ad43f70c25903aa

commit | commitdiff | tree

FEI WU [Sun, 31 Jul 2016 02:25:39 +0000 (02:25 +0000)]

Optimize animation of watch switch thumb am: 31f487642e
am: 1b398ab675

Change-Id: I0bc4e6dca4e3f05120b2d98166316908b3c541af

commit | commitdiff | tree

Michael Kwan [Sun, 31 Jul 2016 02:22:59 +0000 (02:22 +0000)]

Merge \\"Update text appearances for watch type device to conform with typography specs.\\" into cw-f-dev am: 46d89fd5af
am: 719b743831

Change-Id: I9b089a0cb4a13ff85ea3a6b1366084d4d7b5cab6

commit | commitdiff | tree

Michael Kwan [Sun, 31 Jul 2016 02:22:57 +0000 (02:22 +0000)]

Update text appearances for watch type device to conform with typography specs. am: 7a446bb3a5
am: 799abc8d6d

Change-Id: Ib6aff3ac60c4eb107a66ae2df0701733115c3131

commit | commitdiff | tree

Adam Powell [Sun, 31 Jul 2016 02:22:53 +0000 (02:22 +0000)]

Merge \\\"Force AlertDialogLayout to have gravity start|top\\\" into nyc-mr1-dev am: 8960c82dcd am: d35f69d6cd
am: 4808455825

Change-Id: I31aa39fb182fc460b666ff962513dd8858c1208e

commit | commitdiff | tree

Adam Powell [Sun, 31 Jul 2016 02:22:51 +0000 (02:22 +0000)]

Force AlertDialogLayout to have gravity start|top am: 39e0bf23f5 am: cc8fbd3f29
am: 58d91d51c2

Change-Id: Ic75f5fabdb1194005aaa1fdc9b095a45b81126dc

commit | commitdiff | tree

John Reck [Sun, 31 Jul 2016 02:22:46 +0000 (02:22 +0000)]

Merge \\\"Teach JankTracker about new swap behaviors\\\" into nyc-mr1-dev am: 34921ac110 am: c452daab03
am: c05f1ea40b

Change-Id: I41cafb6b921c793277ea0da2c2373d811f9e0998

commit | commitdiff | tree

Hugo Benichi [Sun, 31 Jul 2016 02:13:00 +0000 (02:13 +0000)]

Merge \\\"Fix missing IpConnectivity metrics\\\" into nyc-mr1-dev am: 66e7752ad1 am: b2db402899
am: fb5c675b7e

Change-Id: Iba1f81a892acd9f541b9dd564203bfebc56c9c73

commit | commitdiff | tree

Hugo Benichi [Sun, 31 Jul 2016 02:12:55 +0000 (02:12 +0000)]

Fix missing IpConnectivity metrics am: 90cbc5b444 am: 384818b99d
am: 942ad98481

Change-Id: Ia0e8835969c526424a717068f9bf08496694f1c3

commit | commitdiff | tree

Hugo Benichi [Sun, 31 Jul 2016 02:12:51 +0000 (02:12 +0000)]

Merge \\\"IpConnectivityMetrics: no metrics upload in tests\\\" into nyc-mr1-dev am: 1b4bd22f41 am: 6b104bdabf
am: 9ecb72151b

Change-Id: Iaa83e8914614fa874a88beb8821bb83e0dce5c09

commit | commitdiff | tree

Hugo Benichi [Sun, 31 Jul 2016 02:12:47 +0000 (02:12 +0000)]

IpConnectivityMetrics: no metrics upload in tests am: f9fdf87af2 am: ae048d8363
am: 36a38bc01b

Change-Id: I751af5bd8060dd9ec7e88a9f8cba3b1c2fae81b2

commit | commitdiff | tree

Winson [Sun, 31 Jul 2016 02:12:44 +0000 (02:12 +0000)]

Defaulting wallpaper offset to edge of the screen. am: 4b4ba90d66 am: 18faeaa5fa
am: 48f732db3a

Change-Id: I86d0616df8f938b1b80651be83802796a24250b9

commit | commitdiff | tree

Dan Willemsen [Sat, 30 Jul 2016 20:02:59 +0000 (13:02 -0700)]

resolve merge conflicts of 74bc31f to master

Change-Id: Ib922ebfb3d91a9c837181a3c652f079cec127f3e

commit | commitdiff | tree

David Friedman [Sat, 30 Jul 2016 06:21:12 +0000 (06:21 +0000)]

Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am: a211850784 am: 00f85a4794 am: acbe40ef64 am: c3ae3d1eb2
am: 21a7b9992f

Change-Id: I45acbc99aa4f772542b75ef6caa45638167b9b25

commit | commitdiff | tree

David Friedman [Sat, 30 Jul 2016 06:21:08 +0000 (06:21 +0000)]

Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am: a211850784 am: 00f85a4794 am: 3cf674ee3a
am: d98cfeab73

Change-Id: Iaad320f01c03dd18fe169d86c795120b164fb4e9

commit | commitdiff | tree

Suprabh Shukla [Sat, 30 Jul 2016 06:21:04 +0000 (06:21 +0000)]

Merge \\\"Ensuring KeyguardService has the correct user when it starts\\\" into nyc-mr1-dev am: 81bd8d79cb am: 0a51d0c8cf
am: 2f8e6b3098

Change-Id: I6e3e76459ccfbe3e54518072dfe296d27cec5aff

commit | commitdiff | tree

TreeHugger Robot [Sat, 30 Jul 2016 00:16:56 +0000 (00:16 +0000)]

Merge "resolve merge conflicts of 16dedb7 to master"

commit | commitdiff | tree

Roshan Pius [Fri, 29 Jul 2016 22:58:47 +0000 (22:58 +0000)]

Merge "WifiConfiguration: Expose NetworkSelectionStatus strings"

commit | commitdiff | tree

Suprabh Shukla [Fri, 29 Jul 2016 22:38:49 +0000 (15:38 -0700)]

resolve merge conflicts of 16dedb7 to master

Change-Id: I99024e13f69942f6d687e1f49fe66591c4844d97

commit | commitdiff | tree

Mark Lu [Fri, 29 Jul 2016 21:17:15 +0000 (21:17 +0000)]

Merge \\\\"docs: fix escaped characters in data binding doc\\\\" into nyc-docs am: 4172905146 am: 06c1159b0a am: 1fab755911
am: a2891ed4e3

Change-Id: Ib4cf9aadfa7ab4c11d9dd7ea76d4cc783f45662b

commit | commitdiff | tree

Mark Lu [Fri, 29 Jul 2016 21:17:09 +0000 (21:17 +0000)]

docs: fix escaped characters in data binding doc am: 011c07bd80 am: 494d775cde am: 2d19e4314a
am: 2fa31f8e37

Change-Id: Ic56572f16f22b30302a5b675bf3de1b8142824e4

commit | commitdiff | tree

Mark Lu [Fri, 29 Jul 2016 21:10:43 +0000 (21:10 +0000)]

Merge \\\"docs: fix escaped characters in data binding doc\\\" into nyc-docs am: 4172905146 am: 06c1159b0a
am: 1fab755911

Change-Id: I8c40404a2d3c65db652ea76c74ba0f0dee240e25

commit | commitdiff | tree

Mark Lu [Fri, 29 Jul 2016 21:10:41 +0000 (21:10 +0000)]

docs: fix escaped characters in data binding doc am: 011c07bd80 am: 494d775cde
am: 2d19e4314a

Change-Id: Ib75f69774561bf0355306e7bca5a50bece4c9055

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 29 Jul 2016 21:10:08 +0000 (21:10 +0000)]

Merge "Merge \\\"docs: fix escaped characters in data binding doc\\\" into nyc-docs am: 4172905146 am: 06c1159b0a am: e6e257f46e" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 29 Jul 2016 21:09:54 +0000 (21:09 +0000)]

Merge "docs: fix escaped characters in data binding doc am: 011c07bd80 am: 494d775cde am: ee15ca4437" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Mark Lu [Fri, 29 Jul 2016 21:09:31 +0000 (21:09 +0000)]

Merge \\\"docs: fix escaped characters in data binding doc\\\" into nyc-docs am: 4172905146 am: 06c1159b0a
am: e6e257f46e

Change-Id: If9975539229a2036463e61532dc46501777c989f

commit | commitdiff | tree

Mark Lu [Fri, 29 Jul 2016 21:09:29 +0000 (21:09 +0000)]

docs: fix escaped characters in data binding doc am: 011c07bd80 am: 494d775cde
am: ee15ca4437

Change-Id: I2e9a6c2344640198d4ef15401d33b044e790ac39

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 21:09:28 +0000 (21:09 +0000)]

DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours am: e0316fc7a8 am: bfdf9592d0 am: 59cb7ab7b8 am: 49f14fa7e0 -s ours am: 53e9affbf9 am: 54dd962416
am: 56ff60b465

Change-Id: Ib7c106e06806bc45acdf0594c53ccac41e3d9682

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 21:03:08 +0000 (21:03 +0000)]

DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours am: e0316fc7a8 am: bfdf9592d0 am: 59cb7ab7b8 am: 49f14fa7e0 -s ours am: 53e9affbf9
am: 878abb9bf4

Change-Id: I5a1a62cf09097f2ba1e2be449d3cebd3e7464895

commit | commitdiff | tree

Mark Lu [Fri, 29 Jul 2016 21:03:02 +0000 (21:03 +0000)]

Merge \\"docs: fix escaped characters in data binding doc\\" into nyc-docs am: 4172905146
am: 06c1159b0a

Change-Id: I1fff6816d546f43f0da72cef2fccba445c817b3e

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 21:03:01 +0000 (21:03 +0000)]

DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours am: e0316fc7a8 am: bfdf9592d0 am: 59cb7ab7b8 am: 49f14fa7e0 -s ours am: 53e9affbf9
am: 54dd962416

Change-Id: I86796c357914dbb85cf51cb94ce3f705685aec52

commit | commitdiff | tree

Mark Lu [Fri, 29 Jul 2016 21:02:58 +0000 (21:02 +0000)]

docs: fix escaped characters in data binding doc am: 011c07bd80
am: 494d775cde

Change-Id: If30c7493e1a24fd3a1417eea9f9bc647cc31abce

commit | commitdiff | tree

Mark Lu [Fri, 29 Jul 2016 21:02:55 +0000 (21:02 +0000)]

Merge \\"docs: fix escaped characters in data binding doc\\" into nyc-docs am: 4172905146
am: 06c1159b0a

Change-Id: Ib061e55a5b8b2362e2a28f0db0fa7a6f33630b16

commit | commitdiff | tree

Mark Lu [Fri, 29 Jul 2016 21:02:52 +0000 (21:02 +0000)]

docs: fix escaped characters in data binding doc am: 011c07bd80
am: 494d775cde

Change-Id: Ic9789541688f5953365356f9a0ae03114d21c4e6

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 20:55:43 +0000 (20:55 +0000)]

DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours am: e0316fc7a8 am: bfdf9592d0 am: 59cb7ab7b8 am: 49f14fa7e0 -s ours
am: 53e9affbf9

Change-Id: Ic185caf8064a4077fafb5046e7b4a15de2d0122b

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 20:55:07 +0000 (20:55 +0000)]

DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours am: e0316fc7a8 am: bfdf9592d0 am: 59cb7ab7b8 am: 49f14fa7e0 -s ours
am: 53e9affbf9

Change-Id: I1e597db421eb342f723f15f72d7297ba4daada13

commit | commitdiff | tree

Mark Lu [Fri, 29 Jul 2016 20:54:47 +0000 (20:54 +0000)]

Merge \"docs: fix escaped characters in data binding doc\" into nyc-docs
am: 4172905146

Change-Id: I89e1aeade45c0faf78f569eda75a98f1cf81b773

commit | commitdiff | tree

Mark Lu [Fri, 29 Jul 2016 20:54:45 +0000 (20:54 +0000)]

docs: fix escaped characters in data binding doc
am: 011c07bd80

Change-Id: I319973e92d7e3687c240b71783add9c74af478ce

commit | commitdiff | tree

Fyodor Kupolov [Fri, 29 Jul 2016 20:47:35 +0000 (20:47 +0000)]

Merge \\"Cache package names after reboot\\" into nyc-mr1-dev am: 77faae7282
am: 2c633e9b83

Change-Id: I04eb4420e995c90a6504c59fc603077993c5ed47

commit | commitdiff | tree

Fyodor Kupolov [Fri, 29 Jul 2016 20:47:32 +0000 (20:47 +0000)]

Cache package names after reboot am: 773e997432
am: 94387b55c9

Change-Id: I5de79b71a2f170b4635bdf6406854d2685c9efc9

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 20:47:27 +0000 (20:47 +0000)]

DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s ours am: 0bbdc37b60 am: 25782fae9b am: dd2ec80035 am: d056456fe2 -s ours am: cd17df0011 am: f3af9e5825
am: 6bcbe9a7aa

Change-Id: Ib8e9fa7d02bad93b9b89d97a470ae5f7fedd5794

commit | commitdiff | tree

Mark Lu [Fri, 29 Jul 2016 20:41:08 +0000 (20:41 +0000)]

Merge "docs: fix escaped characters in data binding doc" into nyc-docs

commit | commitdiff | tree

Fyodor Kupolov [Fri, 29 Jul 2016 20:38:14 +0000 (20:38 +0000)]

Merge \"Cache package names after reboot\" into nyc-mr1-dev
am: 77faae7282

Change-Id: Iff7c30a60d38feb2ce5fa5e4412f6fcbf4cd6bdf

commit | commitdiff | tree

Fyodor Kupolov [Fri, 29 Jul 2016 20:38:11 +0000 (20:38 +0000)]

Cache package names after reboot
am: 773e997432

Change-Id: I556f33c4664d37de4a64ffb26b99f7a083edf15b

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 20:38:05 +0000 (20:38 +0000)]

DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s ours am: 0bbdc37b60 am: 25782fae9b am: dd2ec80035 am: d056456fe2 -s ours am: cd17df0011
am: f3af9e5825

Change-Id: I5d6b7e28d15b8994a108ff3bc72c5c3f99d24e3d

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 20:37:47 +0000 (20:37 +0000)]

DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours am: e0316fc7a8 am: bfdf9592d0 am: 59cb7ab7b8
am: 49f14fa7e0 -s ours

Change-Id: I2e6b505b24592dbcbc23e4d8c4025ad9972b73ad

commit | commitdiff | tree

TreeHugger Robot [Fri, 29 Jul 2016 20:23:43 +0000 (20:23 +0000)]

Merge "Cache package names after reboot" into nyc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 29 Jul 2016 20:22:44 +0000 (20:22 +0000)]

Merge "Set secure setting when all preloaded apps are installed"

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 20:20:38 +0000 (20:20 +0000)]

DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s ours am: 0bbdc37b60 am: 25782fae9b am: dd2ec80035 am: d056456fe2 -s ours am: cd17df0011
am: ccad5a8f22

Change-Id: Ib8097e14464f636444598ad9f42fb58f117d20ce

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 20:10:28 +0000 (20:10 +0000)]

DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours am: e0316fc7a8 am: bfdf9592d0
am: 59cb7ab7b8

Change-Id: I166f91e72d1da65610d0f7d697dd70ddb9cfe96a

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 20:07:33 +0000 (20:07 +0000)]

DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s ours am: 0bbdc37b60 am: 25782fae9b am: dd2ec80035 am: d056456fe2 -s ours
am: cd17df0011

Change-Id: I527e41199d4a828ec9b77ead8de99c2496022c29

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 20:03:48 +0000 (20:03 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 29 Jul 2016 19:56:30 +0000 (19:56 +0000)]

Merge "DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522 am: b04c428935 am: e71159c5f7 -s ours am: 204fdc49fc am: 58cf51abb7 am: 41d65fc3b8" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 29 Jul 2016 19:56:17 +0000 (19:56 +0000)]

Merge "Merge \\"Handle reset of recommended services\\" into nyc-mr1-dev am: 0922e6c652 am: 76ce382352" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 29 Jul 2016 19:56:06 +0000 (19:56 +0000)]

Merge "Handle reset of recommended services am: fe789f3189 am: bc11f26a09" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 19:55:25 +0000 (19:55 +0000)]

DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522 am: b04c428935 am: e71159c5f7 -s ours am: 204fdc49fc am: 58cf51abb7
am: 41d65fc3b8

Change-Id: I8d1bf771a86325745f58345b2bb6dfd7165187fa

commit | commitdiff | tree

Philip P. Moltmann [Fri, 29 Jul 2016 19:55:22 +0000 (19:55 +0000)]

Merge \\"Handle reset of recommended services\\" into nyc-mr1-dev am: 0922e6c652
am: 76ce382352

Change-Id: I8dd7604b8b0b82ca6e20da0b94f9fdd65ff053c1

commit | commitdiff | tree

Philip P. Moltmann [Fri, 29 Jul 2016 19:55:18 +0000 (19:55 +0000)]

Handle reset of recommended services am: fe789f3189
am: bc11f26a09

Change-Id: Id23a5eac08cfa6ce88205cb826c6d2fc6eb4b3fe

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 19:54:42 +0000 (19:54 +0000)]

DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s ours am: 0bbdc37b60 am: 25782fae9b am: dd2ec80035
am: d056456fe2 -s ours

Change-Id: Ifb5115f0efac94fbbbb622d442bd32c49df085f5

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 19:54:33 +0000 (19:54 +0000)]

DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522 am: b04c428935 am: e71159c5f7 -s ours am: 204fdc49fc
am: 4d90202dd3

Change-Id: I8a8946386ac17b49794bcfe10d2bdc6ff99068f4

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 19:52:34 +0000 (19:52 +0000)]

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 19:48:00 +0000 (19:48 +0000)]

DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours
am: e0316fc7a8

Change-Id: I0047256a9e88bedc24389de46c0e9f92430fe607

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 19:47:51 +0000 (19:47 +0000)]

DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522 am: b04c428935 am: e71159c5f7 -s ours
am: 204fdc49fc

Change-Id: I923456f924901516f86504ba25699ae38d1c205c

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 19:46:13 +0000 (19:46 +0000)]

DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s ours am: 0bbdc37b60 am: 25782fae9b
am: dd2ec80035

Change-Id: I27b22faf8d6ad4bba039a1eca699bd4163c2ad6a

commit | commitdiff | tree

Felipe Leme [Fri, 29 Jul 2016 19:46:08 +0000 (19:46 +0000)]

Merge \\"Increased size of data_saver_enable_title.\\" into nyc-mr1-dev am: c6655be308
am: af24aba45c

Change-Id: Ibfb67a68ce1b512eb6af948f99ebd4bc24ac1cca

commit | commitdiff | tree

Felipe Leme [Fri, 29 Jul 2016 19:46:04 +0000 (19:46 +0000)]

Increased size of data_saver_enable_title. am: 9b0e888ff9
am: ecf5a195d7

Change-Id: I68c948b34c4af8f16c261899ce628d08400aa193

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 19:46:00 +0000 (19:46 +0000)]

DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522 am: b04c428935 am: e71159c5f7 -s ours am: 204fdc49fc
am: 58cf51abb7

Change-Id: I3fa641028ec04ad26676b85dd5aff689805ba1f7

commit | commitdiff | tree

Phil Weaver [Fri, 29 Jul 2016 19:45:58 +0000 (19:45 +0000)]

Merge \\"Prevent a11y seeing behind tasks w/modal windows.\\" into nyc-mr1-dev am: a200e774e7
am: cf2477ddb4

Change-Id: I1e5348dcf2bef2e9e75a31da6dd214b1211e444e

commit | commitdiff | tree

Philip P. Moltmann [Fri, 29 Jul 2016 19:45:57 +0000 (19:45 +0000)]

Merge \"Handle reset of recommended services\" into nyc-mr1-dev
am: 0922e6c652

Change-Id: I9a1ee585ca0b3494240dbb81757922b6d82a9ad9

commit | commitdiff | tree

Phil Weaver [Fri, 29 Jul 2016 19:45:53 +0000 (19:45 +0000)]

Prevent a11y seeing behind tasks w/modal windows. am: ac9ad70086
am: 7fb5fcc3a6

Change-Id: I800fe6269862dd3bcb9593a73078bad8bba514ae

commit | commitdiff | tree

Philip P. Moltmann [Fri, 29 Jul 2016 19:45:53 +0000 (19:45 +0000)]

Handle reset of recommended services
am: fe789f3189

Change-Id: I66aeb50ca22b06d04c280c3a64ecb62481ca78e6

commit | commitdiff | tree

Felipe Leme [Fri, 29 Jul 2016 19:37:10 +0000 (19:37 +0000)]

Merge \"Increased size of data_saver_enable_title.\" into nyc-mr1-dev
am: c6655be308

Change-Id: Ie05a740d400ebc0fe6ea5ad8d9552fc9bea57737

commit | commitdiff | tree

Felipe Leme [Fri, 29 Jul 2016 19:37:08 +0000 (19:37 +0000)]

Increased size of data_saver_enable_title.
am: 9b0e888ff9

Change-Id: I5aec6f21240d9996a35dbbd634cf7434011de8b7