Commit Graph

326556 Commits

Author SHA1 Message Date
Ben Gruver
cea5efdde8 Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev am: ffd8343ba8 am: 5be97babd6
am: 6fc077a2b1

Change-Id: I350ace09460de3018d9aa6ff5d27fd82bd6cd390
2017-06-10 00:58:56 +00:00
Ben Gruver
6fc077a2b1 Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev am: ffd8343ba8
am: 5be97babd6

Change-Id: Ic49f4796cf1bf26036a7d0aa7c06b2d0823e15de
2017-06-10 00:52:24 +00:00
Ben Gruver
5be97babd6 Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev
am: ffd8343ba8

Change-Id: I5ac1fce3ab71415061ba152d9e34c96f9a53e1c9
2017-06-10 00:45:02 +00:00
Ben Gruver
ffd8343ba8 Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev 2017-06-10 00:39:02 +00:00
Robert Greenwalt
be9a2e4a0a Merge "Changed Locale in ServiceInfo to a list." am: a1df5b25e6 am: af04c43e3b am: 40b0ef4579
am: 52bde254ba

Change-Id: I64363f953a2877159a14ca90463df91c7ea3d1fc
2017-06-10 00:34:33 +00:00
Robert Greenwalt
52bde254ba Merge "Changed Locale in ServiceInfo to a list." am: a1df5b25e6 am: af04c43e3b
am: 40b0ef4579

Change-Id: I6b40f88b1793b157ec3babcb39caf5d916c6301d
2017-06-10 00:26:26 +00:00
Robert Greenwalt
40b0ef4579 Merge "Changed Locale in ServiceInfo to a list." am: a1df5b25e6
am: af04c43e3b

Change-Id: I5fb2897cb5456f92ea4da17d333f091f2f2c1e42
2017-06-10 00:17:22 +00:00
Robert Greenwalt
af04c43e3b Merge "Changed Locale in ServiceInfo to a list."
am: a1df5b25e6

Change-Id: I7477fa88ae9cc83605d2172294bf2ecbcafc567e
2017-06-10 00:10:33 +00:00
George Mount
984bc9cb52 Merge "Merge "Add target sdk check for behavior change." into oc-dev am: e5e246ce5c am: 4e76728dea" into oc-dr1-dev-plus-aosp
am: 5f40d83476

Change-Id: I3ef0603edd519f31224eca164371758d74948787
2017-06-10 00:08:15 +00:00
George Mount
76922bbb97 Merge "Add target sdk check for behavior change." into oc-dev am: e5e246ce5c am: 62a18e12a3
am: 3e9429be6a

Change-Id: Ia5d655f3ce6bb760574bd5abd02115d9284ea395
2017-06-10 00:04:26 +00:00
Robert Greenwalt
a1df5b25e6 Merge "Changed Locale in ServiceInfo to a list." 2017-06-10 00:03:58 +00:00
Android Build Merger (Role)
5f40d83476 Merge "Merge "Add target sdk check for behavior change." into oc-dev am: e5e246ce5c am: 4e76728dea" into oc-dr1-dev-plus-aosp 2017-06-09 23:59:14 +00:00
George Mount
d2cfff5781 Merge "Add target sdk check for behavior change." into oc-dev am: e5e246ce5c
am: 4e76728dea

Change-Id: Ia31e1eefe3771f5cc76b53112e01efdedfe55c58
2017-06-09 23:56:46 +00:00
George Mount
3e9429be6a Merge "Add target sdk check for behavior change." into oc-dev am: e5e246ce5c
am: 62a18e12a3

Change-Id: I0c164eb98dd7265cdc67f107c3500f62dde7536a
2017-06-09 23:56:41 +00:00
Jorim Jaggi
769a55f4b3 Merge "Merge "Fix thread booster" into oc-dev am: 4c1209e00e am: c48a8176e8" into oc-dr1-dev-plus-aosp
am: dc708c88c1

Change-Id: Ic05bd027855f0c955fc059f9a9d06db79f3721bf
2017-06-09 23:53:04 +00:00
George Mount
4e76728dea Merge "Add target sdk check for behavior change." into oc-dev
am: e5e246ce5c

Change-Id: Ia06fe694f2afe55cd9560c2d6ae9112a6735cf93
2017-06-09 23:51:06 +00:00
George Mount
62a18e12a3 Merge "Add target sdk check for behavior change." into oc-dev
am: e5e246ce5c

Change-Id: I3734ee5cd46536a015a8fc60bf8b57818800c792
2017-06-09 23:49:21 +00:00
Jorim Jaggi
0cf055dc1b Merge "Fix thread booster" into oc-dev am: 4c1209e00e am: 2bdff7d64e
am: 3ee99d75dd

Change-Id: Iff38c8efc74c821ed473f50850720e6313244296
2017-06-09 23:49:14 +00:00
Lucas Dupin
495b9e8ff8 Merge "Merge "Removed test from presubmit." into oc-dev am: 4f30aa2be8 am: ed268dc350" into oc-dr1-dev-plus-aosp
am: ac48ff1b2e

Change-Id: Ibacb6e0ed479e61106a263575a336413c84670f5
2017-06-09 23:44:26 +00:00
George Mount
e5e246ce5c Merge "Add target sdk check for behavior change." into oc-dev 2017-06-09 23:41:47 +00:00
Android Build Merger (Role)
dc708c88c1 Merge "Merge "Fix thread booster" into oc-dev am: 4c1209e00e am: c48a8176e8" into oc-dr1-dev-plus-aosp 2017-06-09 23:39:46 +00:00
Lucas Dupin
79bc593fef Merge "Removed test from presubmit." into oc-dev am: 4f30aa2be8 am: c9d11b7e83
am: 1b005bbd5c

Change-Id: Ife3f799d3eae2a032a4391443a64eeb55bebb1fa
2017-06-09 23:38:58 +00:00
Jorim Jaggi
5d5b3583ff Merge "Fix thread booster" into oc-dev am: 4c1209e00e
am: c48a8176e8

Change-Id: I30b49d87ad875b6a0bc30177959a2197cfc5a0b8
2017-06-09 23:38:50 +00:00
Jorim Jaggi
3ee99d75dd Merge "Fix thread booster" into oc-dev am: 4c1209e00e
am: 2bdff7d64e

Change-Id: I3dc39403e74581946f90f0d9b21e981694e752ab
2017-06-09 23:37:22 +00:00
Hugo Benichi
3a137fe1bb Merge "Instrument captive portal login activity" into oc-dr1-dev am: 169f7bebce
am: 4bf6322bcc

Change-Id: I30209378df79cdb77a73adede642c326c2930836
2017-06-09 23:36:36 +00:00
Android Build Merger (Role)
ac48ff1b2e Merge "Merge "Removed test from presubmit." into oc-dev am: 4f30aa2be8 am: ed268dc350" into oc-dr1-dev-plus-aosp 2017-06-09 23:34:13 +00:00
Jorim Jaggi
c48a8176e8 Merge "Fix thread booster" into oc-dev
am: 4c1209e00e

Change-Id: I3ef8bce9cd703a630280595a47baebae12c28387
2017-06-09 23:33:16 +00:00
Lucas Dupin
fbcefcfb07 Merge "Removed test from presubmit." into oc-dev am: 4f30aa2be8
am: ed268dc350

Change-Id: I202bed758385f4918452d78dfef42682521132df
2017-06-09 23:33:16 +00:00
Daniel Sandler
3930e25197 Merge "Merge "" into oc-dev am: 0aaae4ae78 am: 770a4f20cc" into oc-dr1-dev-plus-aosp
am: 07569ab051

Change-Id: I116f6dc308832b64750b6a9e01356e7eddb40fba
2017-06-09 23:32:34 +00:00
Lucas Dupin
1b005bbd5c Merge "Removed test from presubmit." into oc-dev am: 4f30aa2be8
am: c9d11b7e83

Change-Id: I94a073c6151d19a40a5fea2db5871b6dc970de80
2017-06-09 23:31:01 +00:00
Jorim Jaggi
2bdff7d64e Merge "Fix thread booster" into oc-dev
am: 4c1209e00e

Change-Id: Iea1b674cefc1d63eaeb77511904afcf4fdc7639e
2017-06-09 23:30:24 +00:00
Daniel Sandler
1b0a80f108 Merge "" into oc-dev am: 0aaae4ae78 am: 9bb81db15e
am: fbb92565d2

Change-Id: Ifc3403c11ad8efc68e10ee80ede74194f24fde12
2017-06-09 23:29:25 +00:00
Lucas Dupin
ed268dc350 Merge "Removed test from presubmit." into oc-dev
am: 4f30aa2be8

Change-Id: I3f73f3581fad4575f774f2c5ba870cc3308443a4
2017-06-09 23:26:36 +00:00
Jorim Jaggi
4c1209e00e Merge "Fix thread booster" into oc-dev 2017-06-09 23:24:04 +00:00
Lucas Dupin
c9d11b7e83 Merge "Removed test from presubmit." into oc-dev
am: 4f30aa2be8

Change-Id: I49a803f8ecadfab53a686c91c601aaead8a1c81f
2017-06-09 23:23:20 +00:00
Hugo Benichi
4bf6322bcc Merge "Instrument captive portal login activity" into oc-dr1-dev
am: 169f7bebce

Change-Id: I25f8400556ed82e32bbb7abd6e3fccd3df83cd5f
2017-06-09 23:23:17 +00:00
Hugo Benichi
169f7bebce Merge "Instrument captive portal login activity" into oc-dr1-dev 2017-06-09 23:17:32 +00:00
TreeHugger Robot
4f30aa2be8 Merge "Removed test from presubmit." into oc-dev 2017-06-09 23:17:18 +00:00
Android Build Merger (Role)
07569ab051 Merge "Merge "" into oc-dev am: 0aaae4ae78 am: 770a4f20cc" into oc-dr1-dev-plus-aosp 2017-06-09 23:16:33 +00:00
Daniel Sandler
fbb92565d2 Merge "" into oc-dev am: 0aaae4ae78
am: 9bb81db15e

Change-Id: Ic0654fa608e873075938dd2b4ad5aaafd59cc2eb
2017-06-09 23:13:58 +00:00
Daniel Sandler
60811e41c6 Merge "" into oc-dev am: 0aaae4ae78
am: 770a4f20cc

Change-Id: Idc25cc03b6c6d9f2441b90487757dea1e795d48c
2017-06-09 23:13:57 +00:00
Makoto Onuki
2d0785b97d Merge "Whitelist ACTION_QUICK_CONTACT from StrictMode.onFileUriExposed" 2017-06-09 23:10:34 +00:00
Daniel Sandler
9bb81db15e Merge "" into oc-dev
am: 0aaae4ae78

Change-Id: Ibeceac21612da6669d0a216729c2671170651480
2017-06-09 23:05:29 +00:00
Daniel Sandler
770a4f20cc Merge "" into oc-dev
am: 0aaae4ae78

Change-Id: Ic671cd9a8718509728f6058b8d8b695cefbdc0f3
2017-06-09 23:05:19 +00:00
Felipe Leme
eee68dc523 Merge "Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am: 211e760408" into oc-dev-plus-aosp am: c3f93e120c" into oc-dr1-dev-plus-aosp
am: 3d4ac192a1

Change-Id: I6f618fc7b4dc5065c810e5d940f4bdc9b16675c0
2017-06-09 22:57:11 +00:00
Daniel Sandler
0aaae4ae78 Merge "🐙" into oc-dev 2017-06-09 22:55:49 +00:00
Hall Liu
dd58545f44 Merge "Merge "Update documentation for streaming methods" am: 186a588d57 am: 01604ebfc1 am: cfbb73bcde" into oc-dr1-dev-plus-aosp
am: 68f1f6dc94

Change-Id: Ic175c6f0fe25e9d9818de84bd8806a1e17980424
2017-06-09 22:52:20 +00:00
Felipe Leme
be4d33e27c Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am: 211e760408 am: d11e14b428" into oc-dr1-dev-plus-aosp
am: 583ee227f5

Change-Id: I27bf69e6f175c2721a5943ae48e598223d122e47
2017-06-09 22:49:39 +00:00
Todd Lee
ad399d979d Merge "Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394 am: 1b39c88b97 am: 216352792e" into oc-dr1-dev-plus-aosp
am: ca99123233

Change-Id: I80d86eef9bb1120a922fedf97759cf10e9a81a5f
2017-06-09 22:46:34 +00:00
Todd Lee
6a4fa8880d Merge "Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394 am: 1b39c88b97 am: b9bcc1c66a" into oc-dr1-dev-plus-aosp
am: 62eece544d

Change-Id: I3497cd772267a5464ac9244ac0a76ad66966fbd4
2017-06-09 22:43:58 +00:00