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

Bill Yi [Sat, 17 Jun 2017 06:23:30 +0000 (06:23 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: f0bdfbc508 -s ours am: dee1ecf9df -s ours
am: 74facaef64 -s ours

Change-Id: I3462727e4af8ea67b64316422a02cffed77106de

commit | commitdiff | tree

Bill Yi [Sat, 17 Jun 2017 06:17:21 +0000 (06:17 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: f0bdfbc508 -s ours am: c4e253af2a -s ours
am: 7790c15c24 -s ours

Change-Id: I8430e1c917c72992dc77cf32309fbec12940eaa8

commit | commitdiff | tree

Bill Yi [Sat, 17 Jun 2017 06:16:42 +0000 (06:16 +0000)]

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

Change-Id: I135d93838a61fad0211b23aaf5b3b48ef40926b5

commit | commitdiff | tree

Bill Yi [Sat, 17 Jun 2017 06:12:21 +0000 (06:12 +0000)]

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

Change-Id: Iac7e7529df9031b985b24dea82e4e2fc7735a066

commit | commitdiff | tree

TreeHugger Robot [Sat, 17 Jun 2017 06:08:40 +0000 (06:08 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Bill Yi [Sat, 17 Jun 2017 06:07:03 +0000 (06:07 +0000)]

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

Change-Id: I2d6f99108a1aa2a170aac8d50cc1cf3398223fd2

commit | commitdiff | tree

Bill Yi [Sat, 17 Jun 2017 06:06:58 +0000 (06:06 +0000)]

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

Change-Id: I451787702af10fa932a1b5fd256c989ee979ba74

commit | commitdiff | tree

TreeHugger Robot [Sat, 17 Jun 2017 06:02:01 +0000 (06:02 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

TreeHugger Robot [Sat, 17 Jun 2017 05:57:54 +0000 (05:57 +0000)]

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

commit | commitdiff | tree

Bill Yi [Sat, 17 Jun 2017 03:58:12 +0000 (20:58 -0700)]

Import translations. DO NOT MERGE

Change-Id: I9637f1630ab23bef3c25b362d522f633c1fd7be3
Auto-generated-cl: translation import

commit | commitdiff | tree

Philip P. Moltmann [Sat, 17 Jun 2017 03:15:08 +0000 (03:15 +0000)]

Merge "Merge "Only preload selected pages" into oc-dev am: 314457a424 am: 4116849cfb" into oc-dr1-dev-plus-aosp
am: fff2b690ca

Change-Id: I676f274fb034b1a167003f7e7e8cef7deadf2d72

commit | commitdiff | tree

Philip P. Moltmann [Sat, 17 Jun 2017 03:09:25 +0000 (03:09 +0000)]

Merge "Only preload selected pages" into oc-dev am: 314457a424 am: 1af7c0bdbe
am: 39ef047a93

Change-Id: I23d064676ba55ab98946d136dfbf8df635f2309f

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 17 Jun 2017 03:05:09 +0000 (03:05 +0000)]

Merge "Merge "Only preload selected pages" into oc-dev am: 314457a424 am: 4116849cfb" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Philip P. Moltmann [Sat, 17 Jun 2017 03:02:42 +0000 (03:02 +0000)]

Merge "Only preload selected pages" into oc-dev am: 314457a424
am: 1af7c0bdbe

Change-Id: Ia3ecca3507a8d3b2e18dee59f83af0c0804ab68c

commit | commitdiff | tree

Philip P. Moltmann [Sat, 17 Jun 2017 03:02:37 +0000 (03:02 +0000)]

Merge "Only preload selected pages" into oc-dev am: 314457a424
am: 4116849cfb

Change-Id: I9dd4081136a3a3369f954acdd296b99976a31458

commit | commitdiff | tree

Philip P. Moltmann [Sat, 17 Jun 2017 02:57:26 +0000 (02:57 +0000)]

Merge "Only preload selected pages" into oc-dev
am: 314457a424

Change-Id: Ice10d16e149ce7807c50b413939cb71caf52f715

commit | commitdiff | tree

Philip P. Moltmann [Sat, 17 Jun 2017 02:55:42 +0000 (02:55 +0000)]

Merge "Only preload selected pages" into oc-dev
am: 314457a424

Change-Id: Id45d32474d29f4e71fa85997088e7a478b659baf

commit | commitdiff | tree

TreeHugger Robot [Sat, 17 Jun 2017 02:49:55 +0000 (02:49 +0000)]

Merge "Only preload selected pages" into oc-dev

commit | commitdiff | tree

Sundeep Ghuman [Sat, 17 Jun 2017 02:42:18 +0000 (02:42 +0000)]

Merge "Merge "APs from old scans should not have RSSI values set." into oc-dev am: 65c00b2f4e am: a2f661612d" into oc-dr1-dev-plus-aosp
am: 705b111461

Change-Id: Icc07729d64dfe0c7ec3c38f7f5a1323792558ae0

commit | commitdiff | tree

Sundeep Ghuman [Sat, 17 Jun 2017 02:39:23 +0000 (02:39 +0000)]

Merge "APs from old scans should not have RSSI values set." into oc-dev am: 65c00b2f4e am: 4127bdafc7
am: c6e7087700

Change-Id: I2c80ab0bfc79d61414af9ba50362256ce68ddd8c

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 17 Jun 2017 02:35:37 +0000 (02:35 +0000)]

Merge "Merge "APs from old scans should not have RSSI values set." into oc-dev am: 65c00b2f4e am: a2f661612d" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Sundeep Ghuman [Sat, 17 Jun 2017 02:32:45 +0000 (02:32 +0000)]

Merge "APs from old scans should not have RSSI values set." into oc-dev am: 65c00b2f4e
am: a2f661612d

Change-Id: Iff19ad943b40ba317542ddebb505eb27175ac627

commit | commitdiff | tree

Sundeep Ghuman [Sat, 17 Jun 2017 02:32:36 +0000 (02:32 +0000)]

Merge "APs from old scans should not have RSSI values set." into oc-dev am: 65c00b2f4e
am: 4127bdafc7

Change-Id: Iee8ffdde7970a5c623f4820d3e27531df2beb795

commit | commitdiff | tree

Sundeep Ghuman [Sat, 17 Jun 2017 02:26:02 +0000 (02:26 +0000)]

Merge "APs from old scans should not have RSSI values set." into oc-dev
am: 65c00b2f4e

Change-Id: I543f873621ffa26818d6b237d8ed3d1c7769ad98

commit | commitdiff | tree

Sundeep Ghuman [Sat, 17 Jun 2017 02:25:57 +0000 (02:25 +0000)]

Merge "APs from old scans should not have RSSI values set." into oc-dev
am: 65c00b2f4e

Change-Id: I46fc6ca0334f2637007fc188304310475267a20c

commit | commitdiff | tree

TreeHugger Robot [Sat, 17 Jun 2017 02:15:02 +0000 (02:15 +0000)]

Merge "APs from old scans should not have RSSI values set." into oc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 17 Jun 2017 02:09:16 +0000 (02:09 +0000)]

Merge "Merge "Simplify NfcCommand and avoid NullPointerExceptions" am: b5c4e80ecd am: 7ba9270427 am: ffd0a7d95c am: 5b6d397e21"

commit | commitdiff | tree

Myles Watson [Sat, 17 Jun 2017 02:08:20 +0000 (02:08 +0000)]

Merge "Simplify NfcCommand and avoid NullPointerExceptions" am: b5c4e80ecd am: 7ba9270427 am: ffd0a7d95c
am: 5b6d397e21

Change-Id: I2cd3fe0600aeface31afa16f999df8065a418b21

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 17 Jun 2017 02:07:44 +0000 (02:07 +0000)]

Merge "Merge "Allows to change summary text in a custom view tile." into oc-dr1-dev am: 4f52665122 am: 296f9dd45d"

commit | commitdiff | tree

Tomasz Wasilczyk [Sat, 17 Jun 2017 02:07:16 +0000 (02:07 +0000)]

Merge "Close minor RadioService TODO's."

commit | commitdiff | tree

Jaewoong Jung [Sat, 17 Jun 2017 02:06:45 +0000 (02:06 +0000)]

Merge "Allows to change summary text in a custom view tile." into oc-dr1-dev am: 4f52665122
am: 296f9dd45d

Change-Id: Ica4a9cd674b521731ec91cfc6059c9873f60f41d

commit | commitdiff | tree

Felipe Leme [Sat, 17 Jun 2017 02:04:28 +0000 (02:04 +0000)]

Merge "Merge "Revert "Trim text from autofillvalue when checking for empty."" into oc-dev am: 215ebb941d am: 730924cd65" into oc-dr1-dev-plus-aosp
am: ce33087fb5

Change-Id: Ic3ba3425da590344c5f6ec4e703b5ef122856172

commit | commitdiff | tree

Myles Watson [Sat, 17 Jun 2017 01:47:35 +0000 (01:47 +0000)]

Merge "Simplify NfcCommand and avoid NullPointerExceptions" am: b5c4e80ecd am: 7ba9270427
am: ffd0a7d95c

Change-Id: Ia3ac938a14df46beb18d49803732ee953dabf0f3

commit | commitdiff | tree

Myles Watson [Sat, 17 Jun 2017 01:41:09 +0000 (01:41 +0000)]

Merge "Simplify NfcCommand and avoid NullPointerExceptions" am: b5c4e80ecd
am: 7ba9270427

Change-Id: I28b151f93f00cbd3086e8416dbd433f34806205c

commit | commitdiff | tree

Bill Yi [Sat, 17 Jun 2017 01:39:16 +0000 (18:39 -0700)]

Import translations. DO NOT MERGE

Change-Id: Id2e2ab20c78bfcf7ab82807c33466fed3116236b
Auto-generated-cl: translation import

commit | commitdiff | tree

Myles Watson [Sat, 17 Jun 2017 01:34:00 +0000 (01:34 +0000)]

Merge "Simplify NfcCommand and avoid NullPointerExceptions"
am: b5c4e80ecd

Change-Id: I2dcff4d7d0b0bdc5b344f08ce5d563da0a272ddf

commit | commitdiff | tree

Phil Weaver [Sat, 17 Jun 2017 01:31:43 +0000 (01:31 +0000)]

Merge "Merge "Separate a11y and autofill view ids" into oc-dev am: c91290a6e9 am: 0da21f56e4" into oc-dr1-dev-plus-aosp
am: d997fc487f

Change-Id: Iea28ad117ce285213d7e154c064367fb6496cc8e

commit | commitdiff | tree

Felipe Leme [Sat, 17 Jun 2017 01:29:13 +0000 (01:29 +0000)]

Merge "Revert "Trim text from autofillvalue when checking for empty."" into oc-dev am: 215ebb941d am: 1581ceb1fb
am: ffd13036d1

Change-Id: I568601e36d5658560dff9a13bdaf5cb93982cacb

commit | commitdiff | tree

Phil Weaver [Sat, 17 Jun 2017 01:26:53 +0000 (01:26 +0000)]

Merge "Merge "Separate a11y and autofill view ids" into oc-dev am: c91290a6e9 am: 8b2816faa3" into oc-dr1-dev-plus-aosp
am: e9bd6e72fc

Change-Id: I534fb195d21490663e299c39d4a64b63856d7935

commit | commitdiff | tree

Treehugger Robot [Sat, 17 Jun 2017 01:25:12 +0000 (01:25 +0000)]

Merge "Simplify NfcCommand and avoid NullPointerExceptions"

commit | commitdiff | tree

Casey Burkhardt [Sat, 17 Jun 2017 01:24:29 +0000 (01:24 +0000)]

Merge "Merge "Resolve 3 inconsistencies in accessibility button API - Unify logic for detecting availability of the accessibility button - Ensure the initial visibility state is propagated to A11yMS - Ensure services only receive availability callbacks for changes" into oc-dev am: 4ab690a50d am: 5f485cab2b" into oc-dr1-dev-plus-aosp
am: 04f887a82b

Change-Id: I7bfae794e74e2a2ba93871d513f9437583b3c709

commit | commitdiff | tree

Jaewoong Jung [Sat, 17 Jun 2017 01:22:27 +0000 (01:22 +0000)]

Merge "Allows to change summary text in a custom view tile." into oc-dr1-dev
am: 4f52665122

Change-Id: I7d78b51fbf568586f7fb9b3581eadae39b57304c

commit | commitdiff | tree

Casey Burkhardt [Sat, 17 Jun 2017 01:20:37 +0000 (01:20 +0000)]

Merge "Resolve 3 inconsistencies in accessibility button API - Unify logic for detecting availability of the accessibility button - Ensure the initial visibility state is propagated to A11yMS - Ensure services only receive availability callbacks for changes" into oc-dev am: 4ab690a50d am: 8097485c28
am: 8cc3fee95c

Change-Id: Iae4767d6d764f272c3c867276483f7f8522259fe

commit | commitdiff | tree

Myles Watson [Sat, 17 Jun 2017 01:15:32 +0000 (01:15 +0000)]

Merge "Add a svc command for enabling/disabling Bluetooth" am: 7d136b777a am: c0c6e1243b am: d84e4812ef
am: e4f1a15503

Change-Id: I966f241a62e49fa92e03a0ff6a50a3f8658beb02

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 17 Jun 2017 01:15:06 +0000 (01:15 +0000)]

Merge "Merge "Revert "Trim text from autofillvalue when checking for empty."" into oc-dev am: 215ebb941d am: 730924cd65" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Felipe Leme [Sat, 17 Jun 2017 01:14:06 +0000 (01:14 +0000)]

Merge "Revert "Trim text from autofillvalue when checking for empty."" into oc-dev am: 215ebb941d
am: 730924cd65

Change-Id: Ib6d0ed75d7ac5b7ae5c6785082710359e1b23f09

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 17 Jun 2017 01:13:37 +0000 (01:13 +0000)]

Merge "Merge "Separate a11y and autofill view ids" into oc-dev am: c91290a6e9 am: 0da21f56e4" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

TreeHugger Robot [Sat, 17 Jun 2017 01:12:02 +0000 (01:12 +0000)]

Merge "Allows to change summary text in a custom view tile." into oc-dr1-dev

commit | commitdiff | tree

Phil Weaver [Sat, 17 Jun 2017 01:10:28 +0000 (01:10 +0000)]

Merge "Separate a11y and autofill view ids" into oc-dev am: c91290a6e9
am: 0da21f56e4

Change-Id: Idddd94dece2282fc09524e662646ea6a869da3ff

commit | commitdiff | tree

Felipe Leme [Sat, 17 Jun 2017 01:09:38 +0000 (01:09 +0000)]

Merge "Revert "Trim text from autofillvalue when checking for empty."" into oc-dev am: 215ebb941d
am: 1581ceb1fb

Change-Id: Ia8931bffb2a19993b598fcf6ecf9f09ab5157614

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 17 Jun 2017 01:06:38 +0000 (01:06 +0000)]

Merge "Merge "Separate a11y and autofill view ids" into oc-dev am: c91290a6e9 am: 8b2816faa3" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Phil Weaver [Sat, 17 Jun 2017 01:05:36 +0000 (01:05 +0000)]

Merge "Separate a11y and autofill view ids" into oc-dev am: c91290a6e9
am: 8b2816faa3

Change-Id: I567471d68e6ad5b60fcf33eda47e5d99bdb49f2b

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 17 Jun 2017 01:05:21 +0000 (01:05 +0000)]

commit | commitdiff | tree

Felipe Leme [Sat, 17 Jun 2017 01:04:08 +0000 (01:04 +0000)]

Merge "Revert "Trim text from autofillvalue when checking for empty."" into oc-dev
am: 215ebb941d

Change-Id: I058b5fd135e4165214116055ccdc04e9d99955b0

commit | commitdiff | tree

Casey Burkhardt [Sat, 17 Jun 2017 01:02:57 +0000 (01:02 +0000)]

Merge "Resolve 3 inconsistencies in accessibility button API - Unify logic for detecting availability of the accessibility button - Ensure the initial visibility state is propagated to A11yMS - Ensure services only receive availability callbacks for changes" into oc-dev am: 4ab690a50d
am: 8097485c28

Change-Id: I0c21a256e612fd2ecfb2dce6c4d28e3c33e075e2

commit | commitdiff | tree

Casey Burkhardt [Sat, 17 Jun 2017 01:02:56 +0000 (01:02 +0000)]

Merge "Resolve 3 inconsistencies in accessibility button API - Unify logic for detecting availability of the accessibility button - Ensure the initial visibility state is propagated to A11yMS - Ensure services only receive availability callbacks for changes" into oc-dev am: 4ab690a50d
am: 5f485cab2b

Change-Id: I9cc746da6edaac51159503d39fab4a2f2a205788

commit | commitdiff | tree

Bill Yi [Sat, 17 Jun 2017 01:01:31 +0000 (18:01 -0700)]

Import translations. DO NOT MERGE

Change-Id: If0280822a23318f57f8e8f78ab670962f71d2d68
Auto-generated-cl: translation import

commit | commitdiff | tree

Felipe Leme [Sat, 17 Jun 2017 01:01:25 +0000 (01:01 +0000)]

Merge "Revert "Trim text from autofillvalue when checking for empty."" into oc-dev
am: 215ebb941d

Change-Id: I4adf0b0ed352f7f20f93c5fe1bbebea84b4b9bda

commit | commitdiff | tree

Phil Weaver [Sat, 17 Jun 2017 00:59:04 +0000 (00:59 +0000)]

Merge "Separate a11y and autofill view ids" into oc-dev
am: c91290a6e9

Change-Id: Iec71a9ae34f963ef1f0ce7f6bd09b5af5bbba6e6

commit | commitdiff | tree

Phil Weaver [Sat, 17 Jun 2017 00:56:19 +0000 (00:56 +0000)]

Merge "Separate a11y and autofill view ids" into oc-dev
am: c91290a6e9

Change-Id: Ib4566c2f0e32477d5f9eb6510edc140c2b66e0a4

commit | commitdiff | tree

Bryce Lee [Sat, 17 Jun 2017 00:53:57 +0000 (00:53 +0000)]

Merge "Merge "Create native Surface object on updateWindow for legacy apps." into oc-dev am: 1e1c5d7b77 am: e2aec03b9c" into oc-dr1-dev-plus-aosp
am: 0a4753ab7e

Change-Id: Id1284e5389976073af77e8f00373260fbc490b19

commit | commitdiff | tree

TreeHugger Robot [Sat, 17 Jun 2017 00:52:57 +0000 (00:52 +0000)]

Merge "Revert "Trim text from autofillvalue when checking for empty."" into oc-dev

commit | commitdiff | tree

Casey Burkhardt [Sat, 17 Jun 2017 00:52:47 +0000 (00:52 +0000)]

Merge "Resolve 3 inconsistencies in accessibility button API - Unify logic for detecting availability of the accessibility button - Ensure the initial visibility state is propagated to A11yMS - Ensure services only receive availability callbacks for changes" into oc-dev
am: 4ab690a50d

Change-Id: Ia86c49759f9dac2c40b5c28609ab283efb41cd02

commit | commitdiff | tree

Casey Burkhardt [Sat, 17 Jun 2017 00:52:46 +0000 (00:52 +0000)]

Merge "Resolve 3 inconsistencies in accessibility button API - Unify logic for detecting availability of the accessibility button - Ensure the initial visibility state is propagated to A11yMS - Ensure services only receive availability callbacks for changes" into oc-dev
am: 4ab690a50d

Change-Id: I38798fabc99c8db5618a6bd39c8eb6953dbf2bbb

commit | commitdiff | tree

Phil Weaver [Sat, 17 Jun 2017 00:45:59 +0000 (00:45 +0000)]

Merge "Separate a11y and autofill view ids" into oc-dev

commit | commitdiff | tree

Casey Burkhardt [Sat, 17 Jun 2017 00:40:57 +0000 (00:40 +0000)]

commit | commitdiff | tree

Bryce Lee [Sat, 17 Jun 2017 00:36:24 +0000 (00:36 +0000)]

Merge "Create native Surface object on updateWindow for legacy apps." into oc-dev am: 1e1c5d7b77 am: 14d9e3a529
am: d44baa3b7d

Change-Id: I048fb1820809ae04b6acbbf5285459ff17db3ce1

commit | commitdiff | tree

Peter Qiu [Sat, 17 Jun 2017 00:32:59 +0000 (00:32 +0000)]

Merge changes Id60bc858,I32c4eb53,I5b81fb8f into oc-dr1-dev am: d1a616761d
am: 640046b738

Change-Id: I9c9b4f432051079b5f290cb06de40ddda0481060

commit | commitdiff | tree

TreeHugger Robot [Sat, 17 Jun 2017 00:18:22 +0000 (00:18 +0000)]

Merge "MediaCodec: add more details for FLAC CSD."

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 17 Jun 2017 00:00:40 +0000 (00:00 +0000)]

Merge "Merge "Merge "Trim text from autofillvalue when checking for empty." into oc-dev am: b3b13ff62c am: 2de4d6bce4" into oc-dr1-dev-plus-aosp am: 28157d4540"

commit | commitdiff | tree

Felipe Leme [Fri, 16 Jun 2017 23:59:46 +0000 (23:59 +0000)]

Merge "Merge "Trim text from autofillvalue when checking for empty." into oc-dev am: b3b13ff62c am: 2de4d6bce4" into oc-dr1-dev-plus-aosp
am: 28157d4540

Change-Id: Ic75b2ebc577bf950ad8c57e4535dfb00f895c0c0

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 16 Jun 2017 23:58:55 +0000 (23:58 +0000)]

Merge "Merge "Trim text from autofillvalue when checking for empty." into oc-dev am: b3b13ff62c am: 1c03d3fcef am: 9ccb3a86ae"

commit | commitdiff | tree

TreeHugger Robot [Fri, 16 Jun 2017 23:58:00 +0000 (23:58 +0000)]

Merge "Fix mistyped exceptions; InvalidArgumentException"

commit | commitdiff | tree

Felipe Leme [Fri, 16 Jun 2017 23:56:12 +0000 (23:56 +0000)]

Merge "Trim text from autofillvalue when checking for empty." into oc-dev am: b3b13ff62c am: 1c03d3fcef
am: 9ccb3a86ae

Change-Id: I5a6101d80376a0fd60bd6c49fe6a12f8ec9df12e

commit | commitdiff | tree

Myles Watson [Fri, 16 Jun 2017 23:55:32 +0000 (23:55 +0000)]

Merge "Add a svc command for enabling/disabling Bluetooth" am: 7d136b777a am: c0c6e1243b
am: d84e4812ef

Change-Id: I3e5c762fd7e3e11d14ff335a7ed7b963b3c8b53f

commit | commitdiff | tree

Myles Watson [Fri, 16 Jun 2017 23:47:57 +0000 (23:47 +0000)]

Merge "Add a svc command for enabling/disabling Bluetooth" am: 7d136b777a
am: c0c6e1243b

Change-Id: Iab78d232230a6d9ef02d40a03558f7967af7f48c

commit | commitdiff | tree

Tyler Freeman [Fri, 16 Jun 2017 23:47:09 +0000 (23:47 +0000)]

Merge "DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility. am: 79613777df -s ours am: cf82b09998 -s ours am: 2c3ca52a91 -s ours am: 24a5477e03 -s ours" into oc-dr1-dev-plus-aosp
am: b5e0a5bec3 -s ours

Change-Id: I8d9efd6c0ece8fcb1c867d123d1cc6004d57d05b

commit | commitdiff | tree

Myles Watson [Fri, 16 Jun 2017 23:40:26 +0000 (23:40 +0000)]

Merge "Add a svc command for enabling/disabling Bluetooth"
am: 7d136b777a

Change-Id: I62158ee728e6c431c21e5de30ecd9b7b33bbc73a

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 16 Jun 2017 23:36:40 +0000 (23:36 +0000)]

Merge "Merge "Create native Surface object on updateWindow for legacy apps." into oc-dev am: 1e1c5d7b77 am: e2aec03b9c" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Bryce Lee [Fri, 16 Jun 2017 23:33:06 +0000 (23:33 +0000)]

Merge "Create native Surface object on updateWindow for legacy apps." into oc-dev am: 1e1c5d7b77
am: e2aec03b9c

Change-Id: Ibfc7ddbb44f50e78aceab07648489ac1499d57ab

commit | commitdiff | tree

Bryce Lee [Fri, 16 Jun 2017 23:33:03 +0000 (23:33 +0000)]

Merge "Create native Surface object on updateWindow for legacy apps." into oc-dev am: 1e1c5d7b77
am: 14d9e3a529

Change-Id: I722724da6c83337bd810dc3ebe44d5a65451924c

commit | commitdiff | tree

Treehugger Robot [Fri, 16 Jun 2017 23:28:23 +0000 (23:28 +0000)]

Merge "Add a svc command for enabling/disabling Bluetooth"

commit | commitdiff | tree

Bryce Lee [Fri, 16 Jun 2017 23:24:34 +0000 (23:24 +0000)]

Merge "Create native Surface object on updateWindow for legacy apps." into oc-dev
am: 1e1c5d7b77

Change-Id: I2f402ea2a6003e5306a7bbcf1d7b8d640672d460

commit | commitdiff | tree

Bryce Lee [Fri, 16 Jun 2017 23:24:31 +0000 (23:24 +0000)]

Merge "Create native Surface object on updateWindow for legacy apps." into oc-dev
am: 1e1c5d7b77

Change-Id: I35b9aa813c4140cc273272421a05df22b69aeb2e

commit | commitdiff | tree

Tyler Freeman [Fri, 16 Jun 2017 23:23:32 +0000 (23:23 +0000)]

DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility. am: 79613777df -s ours am: cf82b09998 -s ours am: 2c3ca52a91 -s ours am: 24a5477e03 -s ours
am: db4175a50d -s ours

Change-Id: I3e3980e4e3584b3b47c93ce52e8e45aebfe79f5f

commit | commitdiff | tree

Bryce Lee [Fri, 16 Jun 2017 23:15:03 +0000 (23:15 +0000)]

Merge "Create native Surface object on updateWindow for legacy apps." into oc-dev

commit | commitdiff | tree

Tyler Freeman [Fri, 16 Jun 2017 23:14:32 +0000 (23:14 +0000)]

DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility. am: 79613777df -s ours am: cf82b09998 -s ours am: 2c3ca52a91 -s ours am: 19bb979224 -s ours
am: f202c1c56e -s ours

Change-Id: If05d7c4d23a96d54dfaf247cad22f7f48470eeda

commit | commitdiff | tree

Peter Qiu [Fri, 16 Jun 2017 23:12:29 +0000 (23:12 +0000)]

Merge changes Id60bc858,I32c4eb53,I5b81fb8f into oc-dr1-dev
am: d1a616761d

Change-Id: Ic149568e7e8dabb4b7bd7db165ea150209a74d6d

commit | commitdiff | tree

Myles Watson [Tue, 13 Jun 2017 18:42:36 +0000 (11:42 -0700)]

Add a svc command for enabling/disabling Bluetooth

Bug: 62067926
Test: svc bluetooth disable
svc bluetooth enable
Change-Id: I9a53d7ab1805df98d8cf1292cf1061eacc14655d

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 16 Jun 2017 23:09:48 +0000 (23:09 +0000)]

Merge "Merge "Trim text from autofillvalue when checking for empty." into oc-dev am: b3b13ff62c am: 2de4d6bce4" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Felipe Leme [Fri, 16 Jun 2017 23:06:47 +0000 (23:06 +0000)]

Merge "Trim text from autofillvalue when checking for empty." into oc-dev am: b3b13ff62c
am: 1c03d3fcef

Change-Id: I8f94db3b3b129caca53f3cb0ed0b16b2a4951648

commit | commitdiff | tree

Felipe Leme [Fri, 16 Jun 2017 23:06:46 +0000 (23:06 +0000)]

Merge "Trim text from autofillvalue when checking for empty." into oc-dev am: b3b13ff62c
am: 2de4d6bce4

Change-Id: I8eb50d5191b2393011c297671bd5d3c65e1beb7e

commit | commitdiff | tree

TreeHugger Robot [Fri, 16 Jun 2017 23:06:31 +0000 (23:06 +0000)]

Merge changes Id60bc858,I32c4eb53,I5b81fb8f into oc-dr1-dev

* changes:
  Osu2: add class for managing Wi-Fi network connection
  Osu2: setup ProvisionService
  Osu2: basic app setup

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 16 Jun 2017 23:03:25 +0000 (23:03 +0000)]

commit | commitdiff | tree

Wale Ogunwale [Fri, 16 Jun 2017 23:00:57 +0000 (23:00 +0000)]

Merge "Merge "Log last home activity and result we tried to start" into oc-dev am: e8f1a74361 am: 833ca781fc" into oc-dr1-dev-plus-aosp
am: 1ba4268026

Change-Id: I2993807ff93f39b80b5e18e8e33f5e7ef072ad06

commit | commitdiff | tree

Felipe Leme [Fri, 16 Jun 2017 23:00:14 +0000 (23:00 +0000)]

Merge "Trim text from autofillvalue when checking for empty." into oc-dev
am: b3b13ff62c

Change-Id: I5a96a3f2613aeaad1f3d146b5ce6a208b1180851

commit | commitdiff | tree

Tyler Freeman [Fri, 16 Jun 2017 22:58:54 +0000 (22:58 +0000)]

DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility. am: 79613777df -s ours am: cf82b09998 -s ours am: 2c3ca52a91 -s ours
am: 24a5477e03 -s ours

Change-Id: I624498ada7c6fb4705dca185325edb3cd9ac0d77

commit | commitdiff | tree

Tyler Freeman [Fri, 16 Jun 2017 22:58:51 +0000 (22:58 +0000)]

DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility. am: 79613777df -s ours am: cf82b09998 -s ours am: 2c3ca52a91 -s ours
am: 19bb979224 -s ours

Change-Id: Iabcffdb4bc4ab990a19a6f3a44804b8bc0122a04

commit | commitdiff | tree

Felipe Leme [Fri, 16 Jun 2017 22:57:58 +0000 (22:57 +0000)]

Revert "Trim text from autofillvalue when checking for empty."

This reverts commit c5d4e068f2a0c47dc69b72200f8a9fc4bd5a2c28.

Change-Id: I4027cf0f91ebb9032c21efad7025118891188bc6

commit | commitdiff | tree

Wale Ogunwale [Fri, 16 Jun 2017 22:57:49 +0000 (22:57 +0000)]

Merge "Log last home activity and result we tried to start" into oc-dev am: e8f1a74361 am: a7bf2a0ed9
am: 31dc2cb612

Change-Id: I44ff93c850114029c8ce59a2a99a649cd11fc131