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

Roozbeh Pournader [Wed, 12 Apr 2017 23:49:15 +0000 (23:49 +0000)]

Merge "Revert "Make selection end handle stick to selection at line end."" into oc-dev am: d39388219f
am: 4d56a0019a

Change-Id: Idbb6b973a9aa67c9454ed0f839de56fae109561b

commit | commitdiff | tree

Rob Carr [Wed, 12 Apr 2017 23:47:53 +0000 (23:47 +0000)]

Merge "Fix auto-pip visibility issues." into oc-dev am: 7040f573f3
am: 4c613520c3

Change-Id: Ifd2762e1d196b5f353d90a9612c1fcb55cc82976

commit | commitdiff | tree

Lorenzo Colitti [Wed, 12 Apr 2017 23:45:57 +0000 (23:45 +0000)]

Merge "Merge changes from topic 'network_specifier' am: d0f476bdae am: 362bef45d1 am: cfd729093f" into oc-dev-plus-aosp
am: a7e30062c9

Change-Id: I6500639ae839ee9ad5af34d1292d1539c943e2ad

commit | commitdiff | tree

Jiaquan He [Wed, 12 Apr 2017 23:39:41 +0000 (23:39 +0000)]

Merge changes from topics 'KeyboardFocusHighlight-oc-dev', 'KeyboardFocusHighlight_ mDefaultFocusHighlightEnabled-oc-dev', 'KeyboardFocusHighlight_ hasFocusStateSpecified-oc-dev' into oc-dev am: 18d993bb72
am: 7ed2b1adeb

Change-Id: Ie92d455fdc43e627ef436191f8d72737b68c4d96

commit | commitdiff | tree

Jiaquan He [Wed, 12 Apr 2017 23:38:12 +0000 (23:38 +0000)]

Draw a default focus highlight if needed. am: 8062949ece
am: d415eac183 -s ours

Change-Id: I847beeafcdf68ce8228574e754bfd722ec89e0b8

commit | commitdiff | tree

Roozbeh Pournader [Wed, 12 Apr 2017 23:37:03 +0000 (23:37 +0000)]

Merge "Revert "Make selection end handle stick to selection at line end."" into oc-dev
am: d39388219f

Change-Id: Icae3c9b7166b4b83b31ad08bcd78db2205c916c1

commit | commitdiff | tree

Jiaquan He [Wed, 12 Apr 2017 23:36:40 +0000 (23:36 +0000)]

Add a public API defaultFocusHighlightEnabled. am: b7daaf8b5f
am: 557922d37a

Change-Id: I84f82f570dbd32769c82be426bbbc184cc1f53ac

commit | commitdiff | tree

Jiaquan He [Wed, 12 Apr 2017 23:35:40 +0000 (23:35 +0000)]

Detect unhandled keyboard focused state. am: 4a81674b45
am: 4bd8bce6d7

Change-Id: I506ff2c909aa98f049d2f663a6cf714e3e06e6d6

commit | commitdiff | tree

Roozbeh Pournader [Wed, 12 Apr 2017 23:22:33 +0000 (23:22 +0000)]

Merge "Revert "Make selection end handle stick to selection at line end."" into oc-dev

commit | commitdiff | tree

Rob Carr [Wed, 12 Apr 2017 23:03:12 +0000 (23:03 +0000)]

Merge "Fix auto-pip visibility issues." into oc-dev
am: 7040f573f3

Change-Id: I1ac9baf15ac5efc2262f4bcf6ba650b25d326ff9

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 12 Apr 2017 23:00:06 +0000 (23:00 +0000)]

Merge "Merge changes from topic 'network_specifier' am: d0f476bdae am: 362bef45d1 am: cfd729093f" into oc-dev-plus-aosp

commit | commitdiff | tree

Lorenzo Colitti [Wed, 12 Apr 2017 22:58:42 +0000 (22:58 +0000)]

Merge changes from topic 'network_specifier' am: d0f476bdae am: 362bef45d1
am: cfd729093f

Change-Id: I7535495681da8f168c46d6d95e13925cffecc99b

commit | commitdiff | tree

Jiaquan He [Wed, 12 Apr 2017 22:56:15 +0000 (22:56 +0000)]

Merge changes from topics 'KeyboardFocusHighlight-oc-dev', 'KeyboardFocusHighlight_ mDefaultFocusHighlightEnabled-oc-dev', 'KeyboardFocusHighlight_ hasFocusStateSpecified-oc-dev' into oc-dev
am: 18d993bb72

Change-Id: Ic8d6df348c0c3908e32ae8dc288ee48b5a731163

commit | commitdiff | tree

Jiaquan He [Wed, 12 Apr 2017 22:54:17 +0000 (22:54 +0000)]

Draw a default focus highlight if needed.
am: 8062949ece

Change-Id: Ia06126f29168df05fe851746d86e15846ceca1b8

commit | commitdiff | tree

Jiaquan He [Wed, 12 Apr 2017 22:53:09 +0000 (22:53 +0000)]

Add a public API defaultFocusHighlightEnabled.
am: b7daaf8b5f

Change-Id: I189aea9c495255fe68f5af98a6d33bd87dc79e3e

commit | commitdiff | tree

Jiaquan He [Wed, 12 Apr 2017 22:51:56 +0000 (22:51 +0000)]

Detect unhandled keyboard focused state.
am: 4a81674b45

Change-Id: I8c756acc96cab2d24c19f86c50266c2ef51b5494

commit | commitdiff | tree

Tony Mak [Wed, 12 Apr 2017 22:51:35 +0000 (22:51 +0000)]

Merge "clear calling identity before calling settings provider" into oc-dev am: c240c9b134
am: a06e779bfe

Change-Id: Ie2baee0eb27b8c593227dc99e1191a5a44b4c500

commit | commitdiff | tree

Lorenzo Colitti [Wed, 12 Apr 2017 22:48:55 +0000 (22:48 +0000)]

Merge changes from topic 'network_specifier' am: d0f476bdae
am: 362bef45d1

Change-Id: Iea17cb166f9c1bcec55cc8d404e00175aecb9918

commit | commitdiff | tree

Rob Carr [Wed, 12 Apr 2017 22:46:22 +0000 (22:46 +0000)]

Merge "Fix auto-pip visibility issues." into oc-dev

commit | commitdiff | tree

Lorenzo Colitti [Wed, 12 Apr 2017 22:43:03 +0000 (22:43 +0000)]

Merge changes from topic 'network_specifier'
am: d0f476bdae

Change-Id: I783b2d06f3a5e8b9cd7940f1f1ef0dd951c734f1

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Apr 2017 22:40:06 +0000 (22:40 +0000)]

Merge changes from topics 'KeyboardFocusHighlight-oc-dev', 'KeyboardFocusHighlight_ mDefaultFocusHighlightEnabled-oc-dev', 'KeyboardFocusHighlight_ hasFocusStateSpecified-oc-dev' into oc-dev

* changes:
  Fix broken CTS tests.
  Draw a default focus highlight if needed.
  Add a public API defaultFocusHighlightEnabled.
  Detect unhandled keyboard focused state.

commit | commitdiff | tree

Amit Mahajan [Wed, 12 Apr 2017 22:30:39 +0000 (22:30 +0000)]

Merge "Add p2 option in openLogicalChannel." into oc-dev am: 682ce66309
am: 1c29bdda34

Change-Id: I31176c61432ed9efb999991745fc635b734e66ee

commit | commitdiff | tree

Jakub Pawlowski [Wed, 12 Apr 2017 22:29:26 +0000 (22:29 +0000)]

Merge "Bluetooth 5 PHY simplification" am: a9acf9db97 am: d43127865b am: ce8de6c3f7
am: 2ef7bb7b06

Change-Id: Id53332e5bfbd22690992b0d010a24d3601c03092

commit | commitdiff | tree

Dianne Hackborn [Wed, 12 Apr 2017 22:28:10 +0000 (22:28 +0000)]

Merge "Allow appops command to modify uid ops." into oc-dev am: 81bfe1f62e
am: 59c6507670

Change-Id: Iae5d6a6e9fd9d55fbd8a1403aed85e434245dcc6

commit | commitdiff | tree

Lorenzo Colitti [Wed, 12 Apr 2017 22:27:35 +0000 (22:27 +0000)]

Merge changes from topic 'network_specifier'

* changes:
[CM] Unhide the NetworkSpecifier as object API
Make the NetworkSpecifier a class instead of a string.

commit | commitdiff | tree

Svet Ganov [Wed, 12 Apr 2017 22:27:09 +0000 (22:27 +0000)]

Merge "Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am: 39c3d2cf16 am: 91ed4d7553 am: f9197e0180 -s ours" into oc-dev-plus-aosp
am: ed0454fa80

Change-Id: Ieaf8c4e1619c18f226ab220d6029770d22275e56

commit | commitdiff | tree

Julius D'souza [Wed, 12 Apr 2017 22:26:03 +0000 (22:26 +0000)]

Merge "DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am: 0a8ecc6886 am: f72dd4142b am: f72b1104f3 -s ours" into oc-dev-plus-aosp
am: be09e43773

Change-Id: Ib322b18afd1f084152c2c95fc78b2aac3005f4f8

commit | commitdiff | tree

Svet Ganov [Wed, 12 Apr 2017 22:24:54 +0000 (22:24 +0000)]

Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am: 39c3d2cf16 am: 91ed4d7553 -s ours am: 84ec9cbace
am: e9e44c7892

Change-Id: Ic41bfe5a321faf090d9694acc299cccb706947db

commit | commitdiff | tree

Julius D'souza [Wed, 12 Apr 2017 22:23:48 +0000 (22:23 +0000)]

DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am: 0a8ecc6886 am: f72dd4142b -s ours am: 3a967f92f2
am: b19d94bf80

Change-Id: I7a6c5c8e108140564f0f4ff104501e9eb54cd83f

commit | commitdiff | tree

Svet Ganov [Wed, 12 Apr 2017 22:22:39 +0000 (22:22 +0000)]

Merge "Add autofill feature API" into oc-dev am: a402d6dd2f
am: bbef731c2d

Change-Id: I3d1429fe4d101072200aae522a2bdf00596273de

commit | commitdiff | tree

Dianne Hackborn [Wed, 12 Apr 2017 22:21:30 +0000 (22:21 +0000)]

Merge "Add API to get a uid's current importance." into oc-dev am: ad6ab44e15
am: ef95ec85ea

Change-Id: I1c9dce1a5e6e049de65a5f68231a195b9e5d4510

commit | commitdiff | tree

Makoto Onuki [Wed, 12 Apr 2017 22:20:25 +0000 (22:20 +0000)]

Merge ""bmgr restore" really should wait until operation finishes." into oc-dev am: b4c2e6f468
am: 3c0b432ea4

Change-Id: Ib9c45438a8b140028c7e025f4c80ec2d29d9ebc0

commit | commitdiff | tree

Tony Mak [Wed, 12 Apr 2017 22:18:56 +0000 (22:18 +0000)]

Merge "clear calling identity before calling settings provider" into oc-dev
am: c240c9b134

Change-Id: I7b45453ad9dc57ac6c3a9b83f20731f9dcfbf114

commit | commitdiff | tree

Dianne Hackborn [Wed, 12 Apr 2017 22:16:05 +0000 (22:16 +0000)]

Merge "Fix issue #37220301: Allow broadcasts with permissions to not be restricted" into oc-dev am: f74210c3a3
am: 33e80232fc

Change-Id: I9a34336bac3636bb672bf640e4525ec24cd6f2f8

commit | commitdiff | tree

Amit Mahajan [Wed, 12 Apr 2017 22:13:42 +0000 (22:13 +0000)]

Merge "Add p2 option in openLogicalChannel." into oc-dev
am: 682ce66309

Change-Id: I877f9e817beabcf9786796fd5accf06b1dcb3f36

commit | commitdiff | tree

Selim Gurun [Wed, 12 Apr 2017 22:12:57 +0000 (22:12 +0000)]

Merge "Deprecate findAddress() method" into oc-dev am: c68b1a8aef
am: 24d68dc3d8

Change-Id: I3cacbe34c084eb6f98a141535293d5c783a9243b

commit | commitdiff | tree

Shuo Qian [Wed, 12 Apr 2017 22:11:17 +0000 (22:11 +0000)]

Merge "ECBM SystemProperty cleanup" am: 4718606368 am: 40cde7b71f am: 36611a0958
am: 56d3af6680

Change-Id: Ida75e1835bc99a328baeee71b6838581800916b0

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Apr 2017 22:09:19 +0000 (22:09 +0000)]

Merge "clear calling identity before calling settings provider" into oc-dev

commit | commitdiff | tree

Amit Mahajan [Wed, 12 Apr 2017 22:02:34 +0000 (22:02 +0000)]

Merge "Add p2 option in openLogicalChannel." into oc-dev

commit | commitdiff | tree

Jakub Pawlowski [Wed, 12 Apr 2017 21:56:26 +0000 (21:56 +0000)]

Merge "Bluetooth 5 PHY simplification" am: a9acf9db97 am: d43127865b
am: ce8de6c3f7

Change-Id: I74da41983775b03ee2e642a07b5a8bdcf3be45cf

commit | commitdiff | tree

Dianne Hackborn [Wed, 12 Apr 2017 21:51:00 +0000 (21:51 +0000)]

Merge "Allow appops command to modify uid ops." into oc-dev
am: 81bfe1f62e

Change-Id: I843f40212346a3edaf219af5ec47ba16428914ad

commit | commitdiff | tree

Jakub Pawlowski [Wed, 12 Apr 2017 21:45:52 +0000 (21:45 +0000)]

Merge "Bluetooth 5 PHY simplification" am: a9acf9db97
am: d43127865b

Change-Id: I782c0ad038cd68c00b7dd5908c7975e79b672a04

commit | commitdiff | tree

nharold [Wed, 12 Apr 2017 21:43:27 +0000 (21:43 +0000)]

Merge changes from topic 'am-e2002a7381854865a514803d2de26232' into oc-dev-plus-aosp
am: 9a5d047750

Change-Id: I986d031a47a578fda9f61b58e401e7ff53e24bc3

commit | commitdiff | tree

Jason Monk [Wed, 12 Apr 2017 21:42:00 +0000 (21:42 +0000)]

Merge "Make QS light" into oc-dev am: 755138bb1c
am: 5881209cac

Change-Id: Ife0be0ed4dade96bb42a64c39d022e0b84517d91

commit | commitdiff | tree

Bill Yi [Wed, 12 Apr 2017 21:40:52 +0000 (21:40 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: 88ab6c1304 -s ours
am: 8c53d24399 -s ours

Change-Id: I13211570b6e817af73bade9bd26828b833892377

commit | commitdiff | tree

Todd Kennedy [Wed, 12 Apr 2017 21:39:55 +0000 (21:39 +0000)]

Merge "Allow instant app resolution for any user" into oc-dev am: e7b806e9d2
am: 455b742bb6

Change-Id: I12b658529a580c1d29e7dc99f60b87ff048706a3

commit | commitdiff | tree

Dianne Hackborn [Wed, 12 Apr 2017 21:37:47 +0000 (21:37 +0000)]

Merge "Allow appops command to modify uid ops." into oc-dev

commit | commitdiff | tree

Seigo Nonaka [Wed, 12 Apr 2017 21:37:09 +0000 (21:37 +0000)]

Merge "Update Typeface.Builder API to reflect API feedback." into oc-dev am: 1e924df63e
am: fa4b862518

Change-Id: I0aa32f46d20a5d46454f2a6057db2ca0e70f1d84

commit | commitdiff | tree

Jakub Pawlowski [Wed, 12 Apr 2017 21:35:25 +0000 (21:35 +0000)]

Merge "Bluetooth 5 PHY simplification"
am: a9acf9db97

Change-Id: Ibd712a7629d946c24640da0e07496c229c35f7ad

commit | commitdiff | tree

Jesse Evans [Wed, 12 Apr 2017 21:35:09 +0000 (21:35 +0000)]

Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev am: 684b5381e9
am: 3d1676cfc4

Change-Id: I0cc0d165ad5bceb1d93cbe48030e347b53e3caf4

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 12 Apr 2017 21:34:58 +0000 (21:34 +0000)]

Merge "Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am: 39c3d2cf16 am: 91ed4d7553 am: f9197e0180 -s ours" into oc-dev-plus-aosp

commit | commitdiff | tree

Svet Ganov [Wed, 12 Apr 2017 21:34:02 +0000 (21:34 +0000)]

Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am: 39c3d2cf16 am: 91ed4d7553
am: f9197e0180 -s ours

Change-Id: Ib3f118b07fbb994daa70ecbf37bc35dc4d16897b

commit | commitdiff | tree

Jaewan Kim [Wed, 12 Apr 2017 21:33:58 +0000 (21:33 +0000)]

Merge "Add documentation for 'am start-foreground-service'" into oc-dev am: e7ce1d40e1
am: e391fe76e8

Change-Id: Ibf0d1a860cf8cece27f84bb2a9f0c5039ecfd03b

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 12 Apr 2017 21:33:41 +0000 (21:33 +0000)]

Merge "DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am: 0a8ecc6886 am: f72dd4142b am: f72b1104f3 -s ours" into oc-dev-plus-aosp

commit | commitdiff | tree

Julia Reynolds [Wed, 12 Apr 2017 21:32:54 +0000 (21:32 +0000)]

Merge "Clear calling identity before verifying listeners" into oc-dev am: 43dd3ba3c4
am: bf3f4dd7f5

Change-Id: Ib0285d815731cf3ef6ed4c06272584284d54209a

commit | commitdiff | tree

Julius D'souza [Wed, 12 Apr 2017 21:32:43 +0000 (21:32 +0000)]

DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am: 0a8ecc6886 am: f72dd4142b
am: f72b1104f3 -s ours

Change-Id: I5d0b6cd4522507d6b8cffb88461a546de5b6f519

commit | commitdiff | tree

Casey Burkhardt [Wed, 12 Apr 2017 21:31:48 +0000 (21:31 +0000)]

Merge "Improved multiuser support for A11y button/Magnification" into oc-dev am: 9aa64e6cfa
am: 79bc410133

Change-Id: Ia5d0218553dd2a3d2f0a190f2d091e3180fe5773

commit | commitdiff | tree

Svet Ganov [Wed, 12 Apr 2017 21:30:45 +0000 (21:30 +0000)]

Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am: 39c3d2cf16 am: 91ed4d7553 -s ours
am: 84ec9cbace

Change-Id: I44899ea4d5c7a48d7168cb008db31f0b62b093be

commit | commitdiff | tree

Svet Ganov [Wed, 12 Apr 2017 21:30:44 +0000 (21:30 +0000)]

Merge "Fill UI polish" into oc-dev am: c9a83326c2
am: 400f10fe50

Change-Id: Iabc6c0673960d8fee59d78e549ea04826064c37e

commit | commitdiff | tree

Julius D'souza [Wed, 12 Apr 2017 21:29:50 +0000 (21:29 +0000)]

DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am: 0a8ecc6886 am: f72dd4142b -s ours
am: 3a967f92f2

Change-Id: I925d8a6b9bfb9e3020fd3a5a01794f4cc0243be4

commit | commitdiff | tree

Svet Ganov [Wed, 12 Apr 2017 21:28:45 +0000 (21:28 +0000)]

Merge "Add autofill feature API" into oc-dev
am: a402d6dd2f

Change-Id: I5cfa36adbf31c49dffc519963545f388cae4b96d

commit | commitdiff | tree

Dianne Hackborn [Wed, 12 Apr 2017 21:27:27 +0000 (21:27 +0000)]

Merge "Add API to get a uid's current importance." into oc-dev
am: ad6ab44e15

Change-Id: I845cb5fd01ccedd4a95093c56a320ee1f6497dac

commit | commitdiff | tree

Makoto Onuki [Wed, 12 Apr 2017 21:26:08 +0000 (21:26 +0000)]

Merge ""bmgr restore" really should wait until operation finishes." into oc-dev
am: b4c2e6f468

Change-Id: Ic8779cbe121fcc2108bc742a6a9f2be866c76df3

commit | commitdiff | tree

Jakub Pawlowski [Wed, 12 Apr 2017 21:22:26 +0000 (21:22 +0000)]

Merge "Bluetooth 5 PHY simplification"

commit | commitdiff | tree

Svet Ganov [Wed, 12 Apr 2017 21:22:08 +0000 (21:22 +0000)]

Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am: 39c3d2cf16
am: 91ed4d7553

Change-Id: I8c34b0ee542819bb254183a96845e925bce2b0a8

commit | commitdiff | tree

Svet Ganov [Wed, 12 Apr 2017 21:21:56 +0000 (21:21 +0000)]

Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am: 39c3d2cf16
am: 91ed4d7553 -s ours

Change-Id: Ia744f56107b83b6a5d5e236d24641bd7db71ab02

commit | commitdiff | tree

Dianne Hackborn [Wed, 12 Apr 2017 21:21:52 +0000 (21:21 +0000)]

Merge "Fix issue #37220301: Allow broadcasts with permissions to not be restricted" into oc-dev
am: f74210c3a3

Change-Id: I1ed7f3e0cf3ee644bdbe5cb87b06f8b910d9ddec

commit | commitdiff | tree

Julius D'souza [Wed, 12 Apr 2017 21:20:50 +0000 (21:20 +0000)]

DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am: 0a8ecc6886
am: f72dd4142b

Change-Id: I9466a9f2a35ac3f81b2203347afc9f2f62587b20

commit | commitdiff | tree

Julius D'souza [Wed, 12 Apr 2017 21:20:47 +0000 (21:20 +0000)]

DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am: 0a8ecc6886
am: f72dd4142b -s ours

Change-Id: Ia99beb815b720219daecfdc9446c5ff2c4d1b16f

commit | commitdiff | tree

Selim Gurun [Wed, 12 Apr 2017 21:19:16 +0000 (21:19 +0000)]

Merge "Deprecate findAddress() method" into oc-dev
am: c68b1a8aef

Change-Id: I667ebcf6a9a18ae5a07a7e0f737abb6162568f83

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Apr 2017 21:17:29 +0000 (21:17 +0000)]

Merge "Add autofill feature API" into oc-dev

commit | commitdiff | tree

Shuo Qian [Wed, 12 Apr 2017 21:11:58 +0000 (21:11 +0000)]

Merge "ECBM SystemProperty cleanup" am: 4718606368 am: 40cde7b71f
am: 36611a0958

Change-Id: Ib68a4e3b34ad4d76e4b254350b523eaa424b30f9

commit | commitdiff | tree

Svet Ganov [Wed, 12 Apr 2017 21:11:57 +0000 (21:11 +0000)]

Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev
am: 39c3d2cf16

Change-Id: I3ddf7e0ceadd7c179f3c7de198658af190985f1b

commit | commitdiff | tree

Dianne Hackborn [Wed, 12 Apr 2017 21:11:40 +0000 (21:11 +0000)]

Merge "Add API to get a uid's current importance." into oc-dev

commit | commitdiff | tree

Julius D'souza [Wed, 12 Apr 2017 21:10:49 +0000 (21:10 +0000)]

DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET.
am: 0a8ecc6886

Change-Id: I262e7497e9256f708847ba7c767f202c91aa1739

commit | commitdiff | tree

Makoto Onuki [Wed, 12 Apr 2017 21:10:32 +0000 (21:10 +0000)]

Merge ""bmgr restore" really should wait until operation finishes." into oc-dev

commit | commitdiff | tree

Dianne Hackborn [Wed, 12 Apr 2017 21:09:59 +0000 (21:09 +0000)]

Merge "Fix issue #37220301: Allow broadcasts with permissions to not be restricted" into oc-dev

commit | commitdiff | tree

Shuo Qian [Wed, 12 Apr 2017 21:06:20 +0000 (21:06 +0000)]

Merge "ECBM SystemProperty cleanup" am: 4718606368
am: 40cde7b71f

Change-Id: I51ec750ff1833b1982d8fdc1995c1d8d29b36976

commit | commitdiff | tree

Selim Gurun [Wed, 12 Apr 2017 21:05:03 +0000 (21:05 +0000)]

Merge "Deprecate findAddress() method" into oc-dev

commit | commitdiff | tree

Shuo Qian [Wed, 12 Apr 2017 21:00:50 +0000 (21:00 +0000)]

Merge "ECBM SystemProperty cleanup"
am: 4718606368

Change-Id: Ie6b43fd0a0bfa7c813960d1bb53b7b57a4f82721

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Apr 2017 21:00:21 +0000 (21:00 +0000)]

Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 12 Apr 2017 20:54:56 +0000 (20:54 +0000)]

Merge changes from topic 'am-e2002a7381854865a514803d2de26232' into oc-dev-plus-aosp

* changes:
Merge changes from topic 'ipsec-api-tweaks' am: fddf677b8b am: 176bfb58c6 am: a237a34085
IpSecManager and IpSecAlgorithm API Tweaks am: 6045429b35 am: 9c2428ad4d am: 99c50add4f

commit | commitdiff | tree

nharold [Wed, 12 Apr 2017 20:53:17 +0000 (20:53 +0000)]

Merge changes from topic 'ipsec-api-tweaks' am: fddf677b8b am: 176bfb58c6
am: a237a34085

Change-Id: Ie868985d20535f35b869730a4ddaa00dc88a352d

commit | commitdiff | tree

Shuo Qian [Wed, 12 Apr 2017 20:52:18 +0000 (20:52 +0000)]

Merge "ECBM SystemProperty cleanup"

commit | commitdiff | tree

Nathan Harold [Wed, 12 Apr 2017 20:51:41 +0000 (20:51 +0000)]

IpSecManager and IpSecAlgorithm API Tweaks am: 6045429b35 am: 9c2428ad4d
am: 99c50add4f

Change-Id: I49641308cd0f2ce3e8a7545c8b03108d69287c64

commit | commitdiff | tree

Jason Monk [Wed, 12 Apr 2017 20:50:32 +0000 (20:50 +0000)]

Merge "Make QS light" into oc-dev
am: 755138bb1c

Change-Id: I2a76725f4fb4edb0fa478619b28498c9bfc490ac

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Apr 2017 20:43:13 +0000 (20:43 +0000)]

Merge "Make QS light" into oc-dev

commit | commitdiff | tree

Kang Li [Wed, 12 Apr 2017 20:27:14 +0000 (13:27 -0700)]

resolve merge conflicts of 40afdf05b5ba to master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic31b6858fb0850b36bb6751c6bd5ef18675ee277

commit | commitdiff | tree

Bill Yi [Wed, 12 Apr 2017 20:27:30 +0000 (20:27 +0000)]

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

Change-Id: I5f4ab216d538b793f1b9437a9e44320e2412b9cc

commit | commitdiff | tree

Bill Yi [Wed, 12 Apr 2017 20:19:34 +0000 (20:19 +0000)]

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

commit | commitdiff | tree

Todd Kennedy [Wed, 12 Apr 2017 20:00:09 +0000 (20:00 +0000)]

Merge "Allow instant app resolution for any user" into oc-dev
am: e7b806e9d2

Change-Id: Ic1dbc09e11aab6aacf66e0106274281534515b2d

commit | commitdiff | tree

Seigo Nonaka [Wed, 12 Apr 2017 19:55:52 +0000 (19:55 +0000)]

Merge "Update Typeface.Builder API to reflect API feedback." into oc-dev
am: 1e924df63e

Change-Id: I484cd07fb67b40b54d7ad4b1ae7324a0d370ed6a

commit | commitdiff | tree

Jesse Evans [Wed, 12 Apr 2017 19:52:07 +0000 (19:52 +0000)]

Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
am: 684b5381e9

Change-Id: I3be91519cbe8b7c3cef474923a30927504e68642

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Apr 2017 19:45:50 +0000 (19:45 +0000)]

Merge "Allow instant app resolution for any user" into oc-dev

commit | commitdiff | tree

Jaewan Kim [Wed, 12 Apr 2017 19:45:21 +0000 (19:45 +0000)]

Merge "Add documentation for 'am start-foreground-service'" into oc-dev
am: e7ce1d40e1

Change-Id: I4202bc13102f35b8d3cd4b328c5a1de49b7cb08e

commit | commitdiff | tree

Seigo Nonaka [Wed, 12 Apr 2017 19:39:41 +0000 (19:39 +0000)]

Merge "Update Typeface.Builder API to reflect API feedback." into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Apr 2017 19:39:12 +0000 (19:39 +0000)]

Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Apr 2017 19:37:22 +0000 (19:37 +0000)]

Merge "Add documentation for 'am start-foreground-service'" into oc-dev

commit | commitdiff | tree

Julia Reynolds [Wed, 12 Apr 2017 19:24:55 +0000 (19:24 +0000)]

Merge "Clear calling identity before verifying listeners" into oc-dev
am: 43dd3ba3c4

Change-Id: I05a728d069a06f4ec36dff79db022407f4d3504c

commit | commitdiff | tree

Casey Burkhardt [Wed, 12 Apr 2017 19:14:04 +0000 (19:14 +0000)]

Merge "Improved multiuser support for A11y button/Magnification" into oc-dev
am: 9aa64e6cfa

Change-Id: Ia7a56ce9ddc39d1e9e5d814d593dba96c95ae957