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

(root) / android-x86 / frameworks-base.git / log

Todd Lee [Fri, 9 Jun 2017 22:43:58 +0000 (22:43 +0000)]

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

commit | commitdiff | tree

Siyamed Sinir [Fri, 9 Jun 2017 22:40:52 +0000 (22:40 +0000)]

Merge "Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am: bc626c6358 am: c1801c9a8d" into oc-dr1-dev-plus-aosp
am: 6ec22a12a0

Change-Id: I43c8d47f9dc10a7dd79c4d8a011a096b15910f62

commit | commitdiff | tree

Siyamed Sinir [Fri, 9 Jun 2017 22:36:09 +0000 (22:36 +0000)]

Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am: bc626c6358 am: f99e84e4dd
am: a02dcdcebc

Change-Id: I398a879b45a13127c6059986e002f6f4f6eabeea

commit | commitdiff | tree

Svetoslav Ganov [Fri, 9 Jun 2017 22:33:38 +0000 (22:33 +0000)]

Merge "Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5 am: 012c7d29d6" into oc-dr1-dev-plus-aosp
am: 52c76834b4

Change-Id: I8f7f117b98298c9df9b6b5ebc64bef6a61d597d6

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 22:30:19 +0000 (22:30 +0000)]

Merge "Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5 am: fa6b5ac317 am: 984f1be505"

commit | commitdiff | tree

Svetoslav Ganov [Fri, 9 Jun 2017 22:28:46 +0000 (22:28 +0000)]

Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5 am: fa6b5ac317
am: 984f1be505

Change-Id: If51ba200f9042bdfc6f9d83c5a4122e9f830f48a

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 22:26:02 +0000 (22:26 +0000)]

Merge changes from topic 'am-231d306b0fd9428893b0e824a72c78bf'

* changes:
Merge changes from topic 'battery_smear_move' into oc-dev am: 883db32859 am: 308d0dd03c am: f15e4e77f6
Copy smearing method to BatteryStatsHelper am: 5dad8068e2 am: 5047d7bf7f -s ours am: 289b74555f -s ours

commit | commitdiff | tree

Lei Yu [Fri, 9 Jun 2017 22:24:20 +0000 (22:24 +0000)]

Merge changes from topic 'battery_smear_move' into oc-dev am: 883db32859 am: 308d0dd03c
am: f15e4e77f6

Change-Id: I83e8bb805ab7d73f63136133a291ecfeb6d762db

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 22:23:47 +0000 (22:23 +0000)]

Merge "Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394 am: 1b39c88b97 am: b9bcc1c66a" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Roozbeh Pournader [Fri, 9 Jun 2017 22:23:42 +0000 (22:23 +0000)]

Merge "Internationalize InputFilter.AllCaps"

commit | commitdiff | tree

jackqdyulei [Fri, 9 Jun 2017 22:22:57 +0000 (22:22 +0000)]

Copy smearing method to BatteryStatsHelper am: 5dad8068e2 am: 5047d7bf7f -s ours
am: 289b74555f -s ours

Change-Id: Ibe9dfa5cb8761a176b0ce1c529baa35070d94b50

commit | commitdiff | tree

Todd Lee [Fri, 9 Jun 2017 22:22:45 +0000 (22:22 +0000)]

Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394 am: 1b39c88b97
am: b9bcc1c66a

Change-Id: I4031c0127f4ac9ee87eeb9ae8106f343504085f6

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 22:22:36 +0000 (22:22 +0000)]

Merge "Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am: bc626c6358 am: c1801c9a8d" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Siyamed Sinir [Fri, 9 Jun 2017 22:20:48 +0000 (22:20 +0000)]

Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am: bc626c6358
am: c1801c9a8d

Change-Id: Iac201ccb8123f114b492fbbe4c6a151b57f6dd27

commit | commitdiff | tree

Siyamed Sinir [Fri, 9 Jun 2017 22:20:15 +0000 (22:20 +0000)]

Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am: bc626c6358
am: f99e84e4dd

Change-Id: I04a26678d8df05ea59bcec48061f027b0b567baf

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 22:17:09 +0000 (22:17 +0000)]

Merge "Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5 am: 012c7d29d6" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Svetoslav Ganov [Fri, 9 Jun 2017 22:15:07 +0000 (22:15 +0000)]

Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5
am: 012c7d29d6

Change-Id: Ifbf4fd1083e9bb865fa3a20e5aedec43d1bf5eb5

commit | commitdiff | tree

Svetoslav Ganov [Fri, 9 Jun 2017 22:13:37 +0000 (22:13 +0000)]

Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5
am: fa6b5ac317

Change-Id: Idca89686865f91cf2c3a0af895456e865ca4d90b

commit | commitdiff | tree

Lei Yu [Fri, 9 Jun 2017 22:09:24 +0000 (22:09 +0000)]

Merge changes from topic 'battery_smear_move' into oc-dev am: 883db32859 am: bd499f9319
am: da26705adc

Change-Id: I9ebc48f43c00b8447a4726e4a12be1690b10dd2b

commit | commitdiff | tree

Lei Yu [Fri, 9 Jun 2017 22:08:39 +0000 (22:08 +0000)]

Merge changes from topic 'battery_smear_move' into oc-dev am: 883db32859
am: 308d0dd03c

Change-Id: Ifa87d06d51598b005a6f51d2bf3a2ac936848d6e

commit | commitdiff | tree

jackqdyulei [Fri, 9 Jun 2017 22:08:02 +0000 (22:08 +0000)]

Copy smearing method to BatteryStatsHelper am: 5dad8068e2 -s ours am: 6d1e7537f3 -s ours
am: 7bfcc80251 -s ours

Change-Id: I2d0b35a01e0a3cda7d521e51957c5cc06c4f6bd8

commit | commitdiff | tree

jackqdyulei [Fri, 9 Jun 2017 22:07:34 +0000 (22:07 +0000)]

Copy smearing method to BatteryStatsHelper am: 5dad8068e2
am: 5047d7bf7f -s ours

Change-Id: Ie76637f4bfc0bf23b5d74ba9688a03fba795cca5

commit | commitdiff | tree

Todd Lee [Fri, 9 Jun 2017 22:01:45 +0000 (22:01 +0000)]

Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394
am: 1b39c88b97

Change-Id: I62c0a5776bf6307d8d9e580b7d5592352e2efdc8

commit | commitdiff | tree

Lei Yu [Fri, 9 Jun 2017 21:59:27 +0000 (21:59 +0000)]

Merge changes from topic 'battery_smear_move' into oc-dev am: 883db32859
am: bd499f9319

Change-Id: I2add2be471c83285f104f137e45a9a8bbb2b8ce7

commit | commitdiff | tree

jackqdyulei [Fri, 9 Jun 2017 21:58:06 +0000 (21:58 +0000)]

Copy smearing method to BatteryStatsHelper am: 5dad8068e2 -s ours
am: 6d1e7537f3 -s ours

Change-Id: Iac673806f829a216ce3f7222f9d94fd0aac7d371

commit | commitdiff | tree

Siyamed Sinir [Fri, 9 Jun 2017 21:56:09 +0000 (21:56 +0000)]

Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev
am: bc626c6358

Change-Id: I4d3cff4bf6a0403f311011709c3074bca532de15

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 21:54:24 +0000 (21:54 +0000)]

Merge "Merge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db148093c am: 6890569c04" into oc-dr1-dev-plus-aosp
am: ee3797a163

Change-Id: Ic77250f3a3ce14168cfe872da38b443f8792ed6b

commit | commitdiff | tree

Svetoslav Ganov [Fri, 9 Jun 2017 21:49:49 +0000 (21:49 +0000)]

Merge "Protect autofill UI against redressing" into oc-dev
am: 0541862ec5

Change-Id: I07b91f8baa721b58f7f0ff9bf90a29481fdedaac

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 21:45:31 +0000 (21:45 +0000)]

Merge "Merge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db148093c am: b32c05a36a am: 768bfff308"

commit | commitdiff | tree

Roozbeh Pournader [Fri, 9 Jun 2017 21:44:42 +0000 (21:44 +0000)]

Merge "Get underline position and thickness from the font"

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 21:43:56 +0000 (21:43 +0000)]

Merge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db148093c am: b32c05a36a
am: 768bfff308

Change-Id: Ifaa9318d0103e8c0f75b13668026b7fd7ac53e14

commit | commitdiff | tree

Lei Yu [Fri, 9 Jun 2017 21:42:25 +0000 (21:42 +0000)]

Merge changes from topic 'battery_smear_move' into oc-dev
am: 883db32859

Change-Id: I45d4eaadbc992663b3453b52c391d5d4d660e046

commit | commitdiff | tree

jackqdyulei [Fri, 9 Jun 2017 21:41:14 +0000 (21:41 +0000)]

Copy smearing method to BatteryStatsHelper
am: 5dad8068e2 -s ours

Change-Id: I07d9a563f224d739e734af92ae5078d8c6f41100

commit | commitdiff | tree

Siyamed Sinir [Fri, 9 Jun 2017 21:37:17 +0000 (21:37 +0000)]

Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev
am: bc626c6358

Change-Id: I8688bda33124a78d439f1cbcf23926a0672b0735

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 21:35:58 +0000 (21:35 +0000)]

Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am: e4835a2af4 am: d66af648c2
am: cb334c7d33

Change-Id: I74ec7f54702297a95c6239a9c30ae866bf01e021

commit | commitdiff | tree

Chen Xu [Fri, 9 Jun 2017 21:32:45 +0000 (21:32 +0000)]

Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am: cdec393aa3 am: 25c1a060bc
am: efd4097848

Change-Id: I23d06da1724e03b6f7daf06f22d776e5fb69af4b

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 21:32:14 +0000 (21:32 +0000)]

Merge "Merge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db148093c am: 6890569c04" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 21:30:31 +0000 (21:30 +0000)]

Merge "Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am: e4835a2af4 am: 0425f9ceea" into oc-dr1-dev-plus-aosp
am: 18de66783a

Change-Id: Ia323d2afd97c97d72f1207a3d37a8989d1098a2c

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 21:28:01 +0000 (21:28 +0000)]

Merge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db148093c
am: 6890569c04

Change-Id: I8a2985107086b53b450137502e32f07dd5229f6c

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 21:27:48 +0000 (21:27 +0000)]

Merge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db148093c
am: b32c05a36a

Change-Id: I69f9a67ae35a2f8e3ae9982531e391ea8a5b49e5

commit | commitdiff | tree

Chen Xu [Fri, 9 Jun 2017 21:27:31 +0000 (21:27 +0000)]

Merge "Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am: cdec393aa3 am: fce339c49c" into oc-dr1-dev-plus-aosp
am: 385f581ffd

Change-Id: I745d3213d8db86dad2a9779f5c51b6c1ed463719

commit | commitdiff | tree

Svetoslav Ganov [Fri, 9 Jun 2017 21:25:58 +0000 (21:25 +0000)]

Merge "Protect autofill UI against redressing" into oc-dev
am: 0541862ec5

Change-Id: I0073d1eb75fc3460ad126ad08b9d4cf3f566a305

commit | commitdiff | tree

Hemant Gupta [Fri, 9 Jun 2017 21:20:18 +0000 (21:20 +0000)]

OBEX: Add required parameters TAG ID's for PBAP 1.2 am: 6f2b75f574 am: e2ac2e20d6
am: afc9832a1d

Change-Id: Ifb8c22cdb936a76d1a9408228375461909c95369

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 21:20:09 +0000 (21:20 +0000)]

Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am: e4835a2af4
am: d66af648c2

Change-Id: I6317c298d0340cb283e5cdc9b7ec70a7d3fe8e8f

commit | commitdiff | tree

Lei Yu [Fri, 9 Jun 2017 21:17:14 +0000 (21:17 +0000)]

Merge changes from topic 'battery_smear_move' into oc-dev
am: 883db32859

Change-Id: Ibb862780286006efb4a4a117f007cc652dac4ce9

commit | commitdiff | tree

Todd Lee [Fri, 9 Jun 2017 21:16:04 +0000 (21:16 +0000)]

Add missing values for screen percent width dimens am: 5fc6653ea7
am: a58e208394

Change-Id: I0bd6a5e8fe67439d823068229f4bbd828560d7c1

commit | commitdiff | tree

jackqdyulei [Fri, 9 Jun 2017 21:15:56 +0000 (21:15 +0000)]

Copy smearing method to BatteryStatsHelper
am: 5dad8068e2

Change-Id: I1a99fc38a665c3219999b464c1549dd707832f3d

commit | commitdiff | tree

Jordan Liu [Fri, 9 Jun 2017 21:14:11 +0000 (21:14 +0000)]

Merge "Merge "Add IApnSourceService.aidl" into oc-dr1-dev am: 49444fc090 -s ours" into oc-dr1-dev-plus-aosp
am: 51fb4488f5 -s ours

Change-Id: I05a157e758009cbc261f08cf5f492111e2b2de2e

commit | commitdiff | tree

Chen Xu [Fri, 9 Jun 2017 21:14:02 +0000 (21:14 +0000)]

Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am: cdec393aa3
am: 25c1a060bc

Change-Id: I2f400e951b3e1f7cc5fc1ac1548a09c3ae65da7b

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 21:12:03 +0000 (21:12 +0000)]

Merge "Closes Autofill UIs when back button is pressed." into oc-dev
am: 8db148093c

Change-Id: I966af17b26d67f7f29290ee73053e1b833a6623a

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 21:10:19 +0000 (21:10 +0000)]

Merge "Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am: e4835a2af4 am: 0425f9ceea" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 21:09:29 +0000 (21:09 +0000)]

Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am: e4835a2af4
am: 0425f9ceea

Change-Id: I3f817a83fcbda052ba3ca65fb539a7d77ec8d6a9

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 21:08:59 +0000 (21:08 +0000)]

Merge "Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am: cdec393aa3 am: fce339c49c" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Hemant Gupta [Fri, 9 Jun 2017 21:07:38 +0000 (21:07 +0000)]

OBEX: Add required parameters TAG ID's for PBAP 1.2 am: 6f2b75f574 am: b99484cc61
am: 3f6bb65808

Change-Id: I4b05ce913154888e14a2d4940cf9836a79ee89b6

commit | commitdiff | tree

Todd Lee [Fri, 9 Jun 2017 21:07:04 +0000 (21:07 +0000)]

Add missing values for screen percent width dimens
am: 5fc6653ea7

Change-Id: Icecf451c5cb97275234f75f55292729a5f213560

commit | commitdiff | tree

Chen Xu [Fri, 9 Jun 2017 21:06:48 +0000 (21:06 +0000)]

Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am: cdec393aa3
am: fce339c49c

Change-Id: I1b2478820fbc282aa0448d1e1966f0cf81a2b207

commit | commitdiff | tree

Hemant Gupta [Fri, 9 Jun 2017 21:06:09 +0000 (21:06 +0000)]

OBEX: Add required parameters TAG ID's for PBAP 1.2 am: 6f2b75f574
am: e2ac2e20d6

Change-Id: I4641c8bc03d0886d614165ac3c0fd42721c5a046

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 21:05:39 +0000 (21:05 +0000)]

Merge "Closes Autofill UIs when back button is pressed." into oc-dev
am: 8db148093c

Change-Id: I8f0bfb221b17804d3f9ec7b682ebd1256f53aa76

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 21:03:27 +0000 (21:03 +0000)]

Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev
am: e4835a2af4

Change-Id: If88ec9c1de2d81d5b629ed0ead8c9911e6f2c0c5

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 21:02:45 +0000 (21:02 +0000)]

Merge "Merge "Add IApnSourceService.aidl" into oc-dr1-dev am: 49444fc090 -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Chen Xu [Fri, 9 Jun 2017 21:00:26 +0000 (21:00 +0000)]

Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
am: cdec393aa3

Change-Id: I2e175c9a475d2cc2ad225154dbc5c2f855173975

commit | commitdiff | tree

Hemant Gupta [Fri, 9 Jun 2017 21:00:03 +0000 (21:00 +0000)]

OBEX: Add required parameters TAG ID's for PBAP 1.2 am: 6f2b75f574
am: b99484cc61

Change-Id: I701377a315a73eb918f8e42129a401072733cb71

commit | commitdiff | tree

Jordan Liu [Fri, 9 Jun 2017 20:59:54 +0000 (20:59 +0000)]

Merge "Add IApnSourceService.aidl" into oc-dr1-dev
am: 49444fc090 -s ours

Change-Id: Id3b02a2cbcbcaa1bda5cf3515f9b33642afdb96d

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 20:59:53 +0000 (20:59 +0000)]

Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev
am: e4835a2af4

Change-Id: I43a0e7bec7328d7a272c74145817bf4d9a03b69a

commit | commitdiff | tree

Siyamed Sinir [Fri, 9 Jun 2017 20:58:30 +0000 (20:58 +0000)]

Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev

commit | commitdiff | tree

Hemant Gupta [Fri, 9 Jun 2017 20:57:41 +0000 (20:57 +0000)]

OBEX: Add required parameters TAG ID's for PBAP 1.2
am: 6f2b75f574

Change-Id: I8dce42c762758a5ab2ca09b92301697af4d29a8a

commit | commitdiff | tree

Chen Xu [Fri, 9 Jun 2017 20:57:02 +0000 (20:57 +0000)]

Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
am: cdec393aa3

Change-Id: I657161b898c66efdf13c48c322e25cefc7733750

commit | commitdiff | tree

TreeHugger Robot [Fri, 9 Jun 2017 20:54:19 +0000 (20:54 +0000)]

Merge "Add IApnSourceService.aidl" into oc-dr1-dev

commit | commitdiff | tree

Svetoslav Ganov [Fri, 9 Jun 2017 20:53:26 +0000 (20:53 +0000)]

Merge "Protect autofill UI against redressing" into oc-dev

commit | commitdiff | tree

Lei Yu [Fri, 9 Jun 2017 20:50:36 +0000 (20:50 +0000)]

Merge changes from topic 'battery_smear_move' into oc-dev

* changes:
Batterystats logs smeared power model values
Copy smearing method to BatteryStatsHelper

commit | commitdiff | tree

Hemant Gupta [Fri, 9 Jun 2017 20:50:16 +0000 (20:50 +0000)]

OBEX: Add required parameters TAG ID's for PBAP 1.2
am: 6f2b75f574

Change-Id: I9110d7fd8b687f3ee59e3d9ea5ef3319873cdf69

commit | commitdiff | tree

Jeff Sharkey [Fri, 9 Jun 2017 20:37:38 +0000 (20:37 +0000)]

Merge "Omit icons from bulk SessionInfo calls." into oc-dr1-dev am: c017d299ce
am: 00c66f676f

Change-Id: I200f39ef3dd3c336abd48e53a9b93e21f48a7dc0

commit | commitdiff | tree

Jeff Sharkey [Fri, 9 Jun 2017 20:29:11 +0000 (20:29 +0000)]

Merge "Omit icons from bulk SessionInfo calls." into oc-dr1-dev
am: c017d299ce

Change-Id: I57a4f793614c12f32a5e0b8cafa98ef914f2501c

commit | commitdiff | tree

Garry Boyer [Fri, 9 Jun 2017 20:25:42 +0000 (20:25 +0000)]

Merge "Enables child APKs, fixes a package parsing bug, and adds tests."

commit | commitdiff | tree

Jeff Sharkey [Fri, 9 Jun 2017 20:23:14 +0000 (20:23 +0000)]

Merge "Omit icons from bulk SessionInfo calls." into oc-dr1-dev

commit | commitdiff | tree

Jordan Liu [Fri, 9 Jun 2017 20:08:42 +0000 (20:08 +0000)]

Merge "Add IApnSourceService.aidl" am: 1d5d409f6f am: 7b78a176a9 am: b699e98285
am: da7fe3f117 -s ours

Change-Id: I7ccd76d80556dd76626e429a868f6b32f19e3fb9

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 19:47:52 +0000 (19:47 +0000)]

Merge "Closes Autofill UIs when back button is pressed." into oc-dev

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 19:42:13 +0000 (19:42 +0000)]

Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev

commit | commitdiff | tree

Chen Xu [Fri, 9 Jun 2017 19:39:50 +0000 (19:39 +0000)]

Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev

commit | commitdiff | tree

Todd Lee [Wed, 3 May 2017 23:22:42 +0000 (16:22 -0700)]

Add missing values for screen percent width dimens

Protects against bootlooping in the event that developer
inadvertently changes DPI to unsupported value for device.

Use 0dp as it will not be mistaken for anything other
than a broken experience (cts test to validate device DPIs
so as to avoid shipping with this).

bug: b/37755288
Change-Id: Ie9f4aa0d6d226383824e06d28151e06038d0110b

commit | commitdiff | tree

Jordan Liu [Fri, 9 Jun 2017 19:13:20 +0000 (19:13 +0000)]

Merge "Add IApnSourceService.aidl" am: 1d5d409f6f am: 7b78a176a9
am: b699e98285

Change-Id: Ib0d3d447d6058cbc6e348f76e55429627a917591

commit | commitdiff | tree

Jordan Liu [Fri, 9 Jun 2017 19:04:48 +0000 (19:04 +0000)]

Merge "Add IApnSourceService.aidl" am: 1d5d409f6f
am: 7b78a176a9

Change-Id: I8fd54598aae183364ba44a0d5ca2f4331436292a

commit | commitdiff | tree

Pankaj Kanwar [Fri, 9 Jun 2017 18:46:19 +0000 (18:46 +0000)]

Merge "Adding fields in Telephony.java to support the CarrierProvider. Needed for ImsiEncryption."

commit | commitdiff | tree

Hemant Gupta [Sat, 17 Oct 2015 14:10:53 +0000 (19:40 +0530)]

OBEX: Add required parameters TAG ID's for PBAP 1.2

Add required OBEX application parameters TAGID's and length
declarations required to support PBAP 1.2 specification.

Test: Connected with Remote PBAP Client supporting PBAP 1.2 and
      verified that connection and transfer happens over L2CAP.
      Connected with Remote PBAP Client supporting PBAP 1.1 and
      and verified that connection and transfer happens over RFCOMM.
      TestTracker: 89053
Bug: 33011817
Change-Id: I8a772b0dddf6ecf74b057e12d7596421c0e0f558
(cherry picked from commit 9e91b62c1fa4f6c51f53ddb3f2155f345be30a2a)

commit | commitdiff | tree

Winson Chung [Fri, 9 Jun 2017 18:12:54 +0000 (18:12 +0000)]

Merge "Merge "Removing legacy default thumbnail logic." into oc-dev am: a0e44e7335 am: fc926a938e" into oc-dr1-dev-plus-aosp
am: 70bc6258fd

Change-Id: Ibb21bff953a35d07c78ff26678ea2c173eb15560

commit | commitdiff | tree

Winson Chung [Fri, 9 Jun 2017 18:09:06 +0000 (18:09 +0000)]

Merge "Removing legacy default thumbnail logic." into oc-dev am: a0e44e7335 am: d6e3001770
am: 81ca14d751

Change-Id: I2bfa25f16bfc25b6c4202e247ce0c73746c54366

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 18:04:54 +0000 (18:04 +0000)]

Merge "Merge "Removing legacy default thumbnail logic." into oc-dev am: a0e44e7335 am: fc926a938e" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Lei Yu [Fri, 9 Jun 2017 18:03:56 +0000 (18:03 +0000)]

Merge "Copy smearing method to BatteryStatsHelper" into oc-dr1-dev am: 02ece2f486
am: 35aa7879be

Change-Id: Ia67b467eee2cea695914d8d021a172c0059961db

commit | commitdiff | tree

Winson Chung [Fri, 9 Jun 2017 18:03:04 +0000 (18:03 +0000)]

Merge "Removing legacy default thumbnail logic." into oc-dev am: a0e44e7335
am: fc926a938e

Change-Id: I7a59633e9850083816c2dbdaffcc50b7908fa80d

commit | commitdiff | tree

Winson Chung [Fri, 9 Jun 2017 18:02:03 +0000 (18:02 +0000)]

Merge "Removing legacy default thumbnail logic." into oc-dev am: a0e44e7335
am: d6e3001770

Change-Id: I9b7572f08a3b67bf886aa06d02e00a960529aa9b

commit | commitdiff | tree

Clara Bayarri [Fri, 9 Jun 2017 18:01:49 +0000 (18:01 +0000)]

Merge "Merge "Replace fonts of unknown origin" into oc-dev am: 3eae564fec am: e9261d2b84" into oc-dr1-dev-plus-aosp
am: 0d62772fa8

Change-Id: I119bb6fb352d6c5ef60a3dda1143ec68eea13f13

commit | commitdiff | tree

Winson Chung [Fri, 9 Jun 2017 17:56:26 +0000 (17:56 +0000)]

Merge "Removing legacy default thumbnail logic." into oc-dev
am: a0e44e7335

Change-Id: I5bcc319b92c464c28ff4db6c94cf297e786b50d7

commit | commitdiff | tree

Winson Chung [Fri, 9 Jun 2017 17:55:08 +0000 (17:55 +0000)]

Merge "Removing legacy default thumbnail logic." into oc-dev
am: a0e44e7335

Change-Id: I39c832f1ff5b0905bb497c3970c4ce40dad237b8

commit | commitdiff | tree

Lei Yu [Fri, 9 Jun 2017 17:52:41 +0000 (17:52 +0000)]

Merge "Copy smearing method to BatteryStatsHelper" into oc-dr1-dev
am: 02ece2f486

Change-Id: I395712265d3d159c26c4f69f2a7abdfe31398aff

commit | commitdiff | tree

Clara Bayarri [Fri, 9 Jun 2017 17:52:27 +0000 (17:52 +0000)]

Merge "Replace fonts of unknown origin" into oc-dev am: 3eae564fec am: f93c97f73e
am: f26d11f169

Change-Id: I6e758e25deb2325f1383c2df6e2e12e0caf86a87

commit | commitdiff | tree

Winson Chung [Fri, 9 Jun 2017 17:50:44 +0000 (17:50 +0000)]

Merge "Removing legacy default thumbnail logic." into oc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 17:49:19 +0000 (17:49 +0000)]

Merge "Merge "Replace fonts of unknown origin" into oc-dev am: 3eae564fec am: e9261d2b84" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Clara Bayarri [Fri, 9 Jun 2017 17:47:03 +0000 (17:47 +0000)]

Merge "Replace fonts of unknown origin" into oc-dev am: 3eae564fec
am: e9261d2b84

Change-Id: Id70541af980dd26e2d5d3cb80f87690e6b50e717

commit | commitdiff | tree

Lei Yu [Fri, 9 Jun 2017 17:46:26 +0000 (17:46 +0000)]

Merge "Copy smearing method to BatteryStatsHelper" into oc-dr1-dev