315202 Commits

Author SHA1 Message Date
Tomasz Wasilczyk
5fccceb2c5 Merge "Initial implementation of Java-based broadcast radio service." 2017-04-12 14:58:41 +00:00
Michael Wright
7783872441 Merge "Always request keyboard shorcuts, even if there's no menu." into oc-dev am: 7ecd40c1fc
am: 719d1f06fb

Change-Id: Ib6c86d95d893d306de897ce31b07456fc17a124f
2017-04-12 14:28:27 +00:00
Michael Wright
719d1f06fb Merge "Always request keyboard shorcuts, even if there's no menu." into oc-dev
am: 7ecd40c1fc

Change-Id: I003b2cfcdb10a4d9c999ba9cd575561bf7b70086
2017-04-12 14:23:20 +00:00
TreeHugger Robot
7ecd40c1fc Merge "Always request keyboard shorcuts, even if there's no menu." into oc-dev 2017-04-12 14:16:10 +00:00
Pavel Grafov
9c58d46e1d Merge "Improve javadocs for SecurityLog class." into oc-dev am: a9a2bbc647
am: 0b512f27be

Change-Id: I96b2e80ea0eb3b556ae7a48941cdc2579c7957bd
2017-04-12 12:47:44 +00:00
Pavel Grafov
0b512f27be Merge "Improve javadocs for SecurityLog class." into oc-dev
am: a9a2bbc647

Change-Id: I7b6b3d6aa1d27cc09a094b3b01fd6530a2d2ed6c
2017-04-12 12:42:16 +00:00
Pavel Grafov
a9a2bbc647 Merge "Improve javadocs for SecurityLog class." into oc-dev 2017-04-12 12:33:52 +00:00
Johan Toras Halseth
754e98801b Merge "Add helptext to bu command." into oc-dev am: 487e10e22b
am: cb449ccf9d

Change-Id: I8cd00b5ea92dc1ab36d6296acad632f943be078f
2017-04-12 11:18:05 +00:00
Johan Toras Halseth
cb449ccf9d Merge "Add helptext to bu command." into oc-dev
am: 487e10e22b

Change-Id: Id39d64a9634ed91826f6898e97bdbc213ce111a0
2017-04-12 11:06:40 +00:00
TreeHugger Robot
487e10e22b Merge "Add helptext to bu command." into oc-dev 2017-04-12 10:59:59 +00:00
Pavel Grafov
103f797a4c Merge "Introduce DISALLOW_BLUETOOTH_SHARING." 2017-04-12 10:17:19 +00:00
Hugo Benichi
07cd52dc7c Merge "Captive portal: fix probe urls at network creation" am: 923ef69ae7 am: 65fa0676bf am: 4c63d86db7
am: 3bc2ac3f82

Change-Id: I0811f7f36dc8ec6d1312d21660abce77bba7a47f
2017-04-12 10:11:41 +00:00
Hugo Benichi
3bc2ac3f82 Merge "Captive portal: fix probe urls at network creation" am: 923ef69ae7 am: 65fa0676bf
am: 4c63d86db7

Change-Id: Iffc7ff461b685f14ced20ac0cd186f31aa4061ad
2017-04-12 10:00:32 +00:00
Philip P. Moltmann
a55825b07f Merge "Do not inset autofill highlight" into oc-dev am: ac1c224cdc
am: 0a87b90e82

Change-Id: Id85d25a445165c38b1f08e5f13744774e4c36fc7
2017-04-12 09:56:32 +00:00
Kevin Chyn
ec36770783 Merge "Implement enumerate in FingerprintService" into oc-dev am: c2f8949b32
am: 0a08ec9f29

Change-Id: I033456a0ddbbe2c8da46e8df79637e249e28c9fc
2017-04-12 09:55:37 +00:00
Hugo Benichi
4c63d86db7 Merge "Captive portal: fix probe urls at network creation" am: 923ef69ae7
am: 65fa0676bf

Change-Id: I3f4e5e226d6a6371a6fed02d472d1cad4995c64a
2017-04-12 09:55:06 +00:00
Artem Iglikov
ffe2abed60 Merge "Move inner classes of RefactoredBackupManagerService to their own files." 2017-04-12 09:52:36 +00:00
Philip P. Moltmann
0a87b90e82 Merge "Do not inset autofill highlight" into oc-dev
am: ac1c224cdc

Change-Id: I8e37f008c016d25077fe690477422fd4e7422f29
2017-04-12 09:50:07 +00:00
Hugo Benichi
65fa0676bf Merge "Captive portal: fix probe urls at network creation"
am: 923ef69ae7

Change-Id: I82eb06ee1f9d69a1a3ccb5208947bdfcdbba6d81
2017-04-12 09:50:05 +00:00
Kevin Chyn
0a08ec9f29 Merge "Implement enumerate in FingerprintService" into oc-dev
am: c2f8949b32

Change-Id: Iae38c3a036374d5556f1020cd3fd472b5e7c819f
2017-04-12 09:45:43 +00:00
TreeHugger Robot
ac1c224cdc Merge "Do not inset autofill highlight" into oc-dev 2017-04-12 09:43:11 +00:00
Treehugger Robot
923ef69ae7 Merge "Captive portal: fix probe urls at network creation" 2017-04-12 09:38:41 +00:00
TreeHugger Robot
c2f8949b32 Merge "Implement enumerate in FingerprintService" into oc-dev 2017-04-12 09:35:17 +00:00
Abodunrinwa Toki
8b9f1f6756 Merge "Make "Paste as plain text" resource string public." into oc-dev am: 7d4cf66b17
am: 9815cc5783

Change-Id: Ie26187778f0d01be8926484accc9ecbda49946bd
2017-04-12 09:24:28 +00:00
Hyunyoung Song
e7b496f177 Merge "Change AOSP launcher icon mask Test: manual b/36854903" into oc-dev am: 264f2e40e2
am: ebcc722b74

Change-Id: Id5087991c8927f7535cb51686317c5730f53471e
2017-04-12 09:23:04 +00:00
Abodunrinwa Toki
9815cc5783 Merge "Make "Paste as plain text" resource string public." into oc-dev
am: 7d4cf66b17

Change-Id: I6be7e69dd5b172215494a2736bb7e91e36d7b09c
2017-04-12 09:17:33 +00:00
Hyunyoung Song
ebcc722b74 Merge "Change AOSP launcher icon mask Test: manual b/36854903" into oc-dev
am: 264f2e40e2

Change-Id: I702c3b790d6b5c0abb9cbc65cdf4e5bfb2b527d9
2017-04-12 09:12:32 +00:00
TreeHugger Robot
7d4cf66b17 Merge "Make "Paste as plain text" resource string public." into oc-dev 2017-04-12 09:12:23 +00:00
TreeHugger Robot
264f2e40e2 Merge "Change AOSP launcher icon mask Test: manual b/36854903" into oc-dev 2017-04-12 09:02:14 +00:00
Jorim Jaggi
ccb6e53f80 Merge "Fix doc for FLAG_DISMISS_KEYGUARD" into oc-dev am: 39608b8556
am: 11a99404ce

Change-Id: I400130c5126d718d71be7daf5e0685f44eaebd27
2017-04-12 05:29:17 +00:00
Jorim Jaggi
11a99404ce Merge "Fix doc for FLAG_DISMISS_KEYGUARD" into oc-dev
am: 39608b8556

Change-Id: I73dad3226b72bc2b76034c42a77e25be75685a29
2017-04-12 05:18:45 +00:00
TreeHugger Robot
39608b8556 Merge "Fix doc for FLAG_DISMISS_KEYGUARD" into oc-dev 2017-04-12 05:11:03 +00:00
Suprabh Shukla
4741e74b8a Merge "Renaming intent action for unknown sources" into oc-dev am: a609bbc9c4
am: 56fa529c28

Change-Id: I28f085f5ea2b2d94c23a42f69ce19ea6c8d5c94f
2017-04-12 04:55:08 +00:00
Suprabh Shukla
56fa529c28 Merge "Renaming intent action for unknown sources" into oc-dev
am: a609bbc9c4

Change-Id: I67e378a818d5fb74e602a32c67eb3299adf36549
2017-04-12 04:45:31 +00:00
Suprabh Shukla
a609bbc9c4 Merge "Renaming intent action for unknown sources" into oc-dev 2017-04-12 04:32:51 +00:00
Julius D'souza
4e4c99f9a5 Merge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." 2017-04-12 03:29:25 +00:00
Julius D'souza
e67e60fad4 Merge "Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev am: 9e3c9eeb96 am: 3c6d6f53f3 am: 6717748eff -s ours" into oc-dev-plus-aosp
am: 9431773039

Change-Id: I6f01161b7d11a65585c8da025932c84d32663c92
2017-04-12 02:24:40 +00:00
Julius D'souza
e7fd499a33 Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev am: 9e3c9eeb96 am: 3c6d6f53f3 -s ours am: ed799ef6fb
am: 3e00a43eb0

Change-Id: I274fafafda952f5426cb7119d1752710f64861ce
2017-04-12 02:21:15 +00:00
Android Build Merger (Role)
9431773039 Merge "Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev am: 9e3c9eeb96 am: 3c6d6f53f3 am: 6717748eff -s ours" into oc-dev-plus-aosp 2017-04-12 02:12:39 +00:00
Julius D'souza
3e00a43eb0 Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev am: 9e3c9eeb96 am: 3c6d6f53f3 -s ours
am: ed799ef6fb

Change-Id: I61b21b6fe6e3bbb97b8cc2f67f7d66a9c66ef943
2017-04-12 02:11:27 +00:00
Julius D'souza
4508ed51d4 Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev am: 9e3c9eeb96 am: 3c6d6f53f3
am: 6717748eff  -s ours

Change-Id: I8ef6575486308872b5eaea54777b497dc3a00616
2017-04-12 02:11:26 +00:00
Julius D'souza
ed799ef6fb Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev am: 9e3c9eeb96
am: 3c6d6f53f3  -s ours

Change-Id: Ic4af1cac3a0929db20eccd0693ec5fad834b0093
2017-04-12 02:01:49 +00:00
Julius D'souza
6717748eff Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev am: 9e3c9eeb96
am: 3c6d6f53f3

Change-Id: I4a3785a799a523c1e650929cf70f333a2492377e
2017-04-12 02:01:28 +00:00
Julia Reynolds
c735ac04d3 Merge "Changing importance should record user locked field." into oc-dev am: f61985f02e
am: cc6836cf64

Change-Id: I8f0b3c1aaa7a7f764c8ce815feb6fc3005710bda
2017-04-12 01:56:06 +00:00
Julius D'souza
3c6d6f53f3 Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev
am: 9e3c9eeb96

Change-Id: Ic97ec1a7e4c5b76bcab8350102585e4dd2cd199b
2017-04-12 01:55:57 +00:00
Andreas Gampe
6f1ad95b1b Merge "OtaDexOptService: Log post-reboot moves" into oc-dev am: fac61e4928
am: bbf9b5d35d

Change-Id: I6ca07f8f797562db9a2ed270c0585561de5739cf
2017-04-12 01:55:01 +00:00
Julia Reynolds
cc6836cf64 Merge "Changing importance should record user locked field." into oc-dev
am: f61985f02e

Change-Id: I8e53594947fd6bf1439da9c5d70e86cff111983b
2017-04-12 01:46:07 +00:00
Andreas Gampe
bbf9b5d35d Merge "OtaDexOptService: Log post-reboot moves" into oc-dev
am: fac61e4928

Change-Id: Id9d427f5d101d7d99ef313fd3b1ede9776ae655d
2017-04-12 01:45:01 +00:00
Julius D'souza
9e3c9eeb96 Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev 2017-04-12 01:41:42 +00:00
TreeHugger Robot
f61985f02e Merge "Changing importance should record user locked field." into oc-dev 2017-04-12 01:41:00 +00:00