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

Fyodor Kupolov [Tue, 23 Aug 2016 16:55:53 +0000 (16:55 +0000)]

Merge "Added getDataPreloadsMediaDirectory" into nyc-dr1-dev am: 0a376f5619 am: 6af20d1c4e
am: a6742e1c7a

Change-Id: I06ec455274d7f570b3b88c10aa6d59d263e5ce57

commit | commitdiff | tree

Fyodor Kupolov [Tue, 23 Aug 2016 16:54:29 +0000 (16:54 +0000)]

Added getDataPreloadsMediaDirectory am: 19551a8d8d am: c98c7e9da1
am: ca1a630ccf

Change-Id: I43f40049cc3fd8ae8cd6a9f7219047a260b4032e

commit | commitdiff | tree

Jorim Jaggi [Tue, 23 Aug 2016 16:45:10 +0000 (16:45 +0000)]

Merge changes from topic 'am-c5d69672042b41758555eb3db8f077fe' into nyc-mr1-dev am: f6f4f1ac61
am: 6afa73312c

Change-Id: Ic0b037b6889a4d82c489082ddd4501c9720fa5f8

commit | commitdiff | tree

Jorim Jaggi [Tue, 23 Aug 2016 16:44:30 +0000 (16:44 +0000)]

Merge "Change retail mode wallpaper (1/2)" into nyc-dr1-dev am: c7136b3b3c am: 9b2c0bf87e
am: 5a08c35738

Change-Id: Ib6301c2a5cb3365361750722334f6257724c089d

commit | commitdiff | tree

Jorim Jaggi [Tue, 23 Aug 2016 16:43:54 +0000 (16:43 +0000)]

Change retail mode wallpaper (1/2) am: 6c902d0453 am: 9d0879c6ac
am: 3d19454ec9

Change-Id: Ibd859202fd2db910170e8bda6f8c947cd05486f7

commit | commitdiff | tree

Adam Powell [Tue, 23 Aug 2016 16:43:49 +0000 (16:43 +0000)]

Merge "Merge "Only dispatch window visibility aggregation for targetSdk >= N" into nyc-dr1-dev am: 081e393103" into nyc-mr1-dev am: b352d0a45a
am: 2c9cfdf968

Change-Id: I163efef26834bb854913a89031fd1fdf3d87de1a

commit | commitdiff | tree

Adam Powell [Tue, 23 Aug 2016 16:43:45 +0000 (16:43 +0000)]

Merge "Only dispatch window visibility aggregation for targetSdk >= N" into nyc-dr1-dev am: 081e393103 am: 1b192da3fe
am: abcc76610f

Change-Id: I9a0c49aeb2b6a658b06abf9e5971a5eaa1e17469

commit | commitdiff | tree

Adam Powell [Tue, 23 Aug 2016 16:39:55 +0000 (16:39 +0000)]

Merge "Only dispatch window visibility aggregation for targetSdk >= N am: 64e1ba4398" into nyc-mr1-dev am: 998ff1c7be
am: 79cb1d7a49

Change-Id: I79536026e3262c5eea8ce71119a717e87602ba72

commit | commitdiff | tree

Adam Powell [Tue, 23 Aug 2016 16:39:52 +0000 (16:39 +0000)]

Only dispatch window visibility aggregation for targetSdk >= N am: 64e1ba4398 am: 02abbe8d4c
am: ca3a267478

Change-Id: I906793dda8f825882b562ab39822274cb5a0a1c7

commit | commitdiff | tree

Dirk Dougherty [Tue, 23 Aug 2016 16:39:47 +0000 (16:39 +0000)]

Merge "Doc change: intl page updates for final n release. am: e816f1f542 am: 79d9e9df2e" into nyc-mr1-dev am: f14ba4c10f
am: 67442d4c7a

Change-Id: I14382558e76f266070dc9e4ffad5a73f4a22afec

commit | commitdiff | tree

Dirk Dougherty [Tue, 23 Aug 2016 16:39:44 +0000 (16:39 +0000)]

Doc change: intl page updates for final n release. am: e816f1f542 am: 79d9e9df2e am: 4a273d8bb9
am: 4639359ddc

Change-Id: Ie3659cc81327f8927d960df8d67b269a2ca33df0

commit | commitdiff | tree

Chris Tate [Tue, 23 Aug 2016 16:39:41 +0000 (16:39 +0000)]

Merge "Merge "Fix wallpaper backup eligibility test" into nyc-dr1-dev am: 56ce19099d" into nyc-mr1-dev am: 2733c16556
am: 9927f7f08b

Change-Id: I6bb032180f73dcf5c727504cd3069b792d36b46a

commit | commitdiff | tree

Chris Tate [Tue, 23 Aug 2016 16:36:10 +0000 (16:36 +0000)]

Merge "Fix wallpaper backup eligibility test" into nyc-dr1-dev am: 56ce19099d am: ad3f9a03ea
am: f4b8d26f9d

Change-Id: Iea622292cd7dc517b908a01caecafd9ffa17765b

commit | commitdiff | tree

Christopher Tate [Tue, 23 Aug 2016 16:36:07 +0000 (16:36 +0000)]

Merge "Fix wallpaper backup eligibility test am: f7d1b5de6e" into nyc-mr1-dev am: e022290806
am: c899f55156

Change-Id: I23b9aa64172ffd8a2f48e4355f5745567536b9a7

commit | commitdiff | tree

Christopher Tate [Tue, 23 Aug 2016 16:36:04 +0000 (16:36 +0000)]

Fix wallpaper backup eligibility test am: f7d1b5de6e am: 100b610066
am: 6939bf0b05

Change-Id: I6316060245690a61049e92c7649efe82606b8f94

commit | commitdiff | tree

Adam Seaton [Tue, 23 Aug 2016 16:36:00 +0000 (16:36 +0000)]

Merge "Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Prevent FIFO threads from creating more FIFO threads." into nyc-dr1-dev am: 051d6b74eb -s ours" into nyc-mr1-dev am: f7e165972f -s ours
am: 9058e1ac19 -s ours

Change-Id: Id7f12b06be0e68a7cfe6fe3247bc0b4aa6201f2f

commit | commitdiff | tree

Adam Seaton [Tue, 23 Aug 2016 16:35:57 +0000 (16:35 +0000)]

Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Prevent FIFO threads from creating more FIFO threads." into nyc-dr1-dev am: 051d6b74eb -s ours am: 6b5a4bf98b -s ours
am: bbbd17c67d -s ours

Change-Id: I212b806615e2be865c86b2107a2d2f9f77f60192

commit | commitdiff | tree

Tim Murray [Tue, 23 Aug 2016 16:31:20 +0000 (16:31 +0000)]

Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Prevent FIFO threads from creating more FIFO threads. am: d72b26085c -s ours" into nyc-mr1-dev am: 6a1c2227be -s ours
am: b7b31b415a -s ours

Change-Id: Id0828e5d951e02dcb3f0334b1884b0544c98701a

commit | commitdiff | tree

Tim Murray [Tue, 23 Aug 2016 16:31:17 +0000 (16:31 +0000)]

DO NOT MERGE ANYWHERE (nyc-dr1-dev) Prevent FIFO threads from creating more FIFO threads. am: d72b26085c -s ours am: fbc47f734f -s ours
am: 4b4fe6e0f2 -s ours

Change-Id: I78c1591ab87f83603265e7932a387055dec1f724

commit | commitdiff | tree

Sanket Padawe [Tue, 23 Aug 2016 16:31:14 +0000 (16:31 +0000)]

Merge "Merge "If Vodafone Italy sim is in Spain consider it as roaming on Spain nw." into nyc-mr1-dev am: 4a6f3bb921" into cw-f-dev
am: effaf79494

Change-Id: Ie6003ac94caac0ece33ff180cc0677caded12a7f

commit | commitdiff | tree

Sanket Padawe [Tue, 23 Aug 2016 16:31:11 +0000 (16:31 +0000)]

Merge "If Vodafone Italy sim is in Spain consider it as roaming on Spain nw." into nyc-mr1-dev am: 4a6f3bb921
am: 078c557688

Change-Id: I69a7d8bca11dc50fb432985a6d9f4eb16263b1c4

commit | commitdiff | tree

Sanket Padawe [Tue, 23 Aug 2016 16:31:03 +0000 (16:31 +0000)]

Merge "If Vodafone Italy sim is in Spain consider it as roaming on Spain nw. am: 0cc68dbf29" into cw-f-dev
am: eaef72bda5

Change-Id: I198374fa6d7f13f827a83a687b132308e4739068

commit | commitdiff | tree

Sanket Padawe [Tue, 23 Aug 2016 16:30:59 +0000 (16:30 +0000)]

If Vodafone Italy sim is in Spain consider it as roaming on Spain nw. am: 0cc68dbf29
am: e8a2c5c331

Change-Id: Ifa503d0b899bc1ad19c5365eb561d2ebeac5ee15

commit | commitdiff | tree

Adam Seaton [Tue, 23 Aug 2016 16:30:51 +0000 (16:30 +0000)]

Merge "Merge "DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information" into nyc-dr1-dev am: ad1008d089 -s ours am: aad9147dca -s ours" into cw-f-dev
am: 05f0dd1ed3 -s ours

Change-Id: Ie78d2d8efb76649106c9aa6306285a01408e018c

commit | commitdiff | tree

Adam Seaton [Tue, 23 Aug 2016 16:30:47 +0000 (16:30 +0000)]

Merge "DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information" into nyc-dr1-dev am: ad1008d089 -s ours am: aad9147dca -s ours
am: 7eaccf8e79 -s ours

Change-Id: I8535594105bc3a8001c5967e5b97bda8eedbda8c

commit | commitdiff | tree

Andy Hung [Tue, 23 Aug 2016 16:19:31 +0000 (16:19 +0000)]

Merge "DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information am: 05a1df9967 -s ours am: 33a04f8333 -s ours" into cw-f-dev
am: e8b0a5a01a -s ours

Change-Id: I73640af5d3b79919c61c1d39641be7f83d8423a4

commit | commitdiff | tree

Andy Hung [Tue, 23 Aug 2016 16:19:28 +0000 (16:19 +0000)]

DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information am: 05a1df9967 -s ours am: 33a04f8333 -s ours
am: 228a63ffac -s ours

Change-Id: I5e9fef59dfeec9aa871e16be160d79f17ec76a61

commit | commitdiff | tree

Adam Seaton [Tue, 23 Aug 2016 16:19:20 +0000 (16:19 +0000)]

Merge "Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity." into nyc-dr1-dev am: 0f1e7ab1d3 -s ours am: fcd16254c6 -s ours" into cw-f-dev
am: 44fc86b8b8 -s ours

Change-Id: Id369b6061f8e6abd5b07eccc87b48ead1236a1ac

commit | commitdiff | tree

Adam Seaton [Tue, 23 Aug 2016 16:19:16 +0000 (16:19 +0000)]

Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity." into nyc-dr1-dev am: 0f1e7ab1d3 -s ours am: fcd16254c6 -s ours
am: b9475468f5 -s ours

Change-Id: I08187baf768d319a768bf5f5f8d25759356c416e

commit | commitdiff | tree

George Mount [Tue, 23 Aug 2016 16:19:09 +0000 (16:19 +0000)]

Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity. am: c9373e5505 -s ours am: 27d769e3b0 -s ours" into cw-f-dev
am: 986912ee69 -s ours

Change-Id: I35565278f999f97bf2ffd9e2ba6d197152fa20e5

commit | commitdiff | tree

George Mount [Tue, 23 Aug 2016 16:19:06 +0000 (16:19 +0000)]

DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity. am: c9373e5505 -s ours am: 27d769e3b0 -s ours
am: c9ec6286d1 -s ours

Change-Id: I7f36727b27a5e2405919002eaed80d96d51b04c4

commit | commitdiff | tree

Todd Kennedy [Tue, 23 Aug 2016 16:19:00 +0000 (16:19 +0000)]

Merge "DO NOT MERGE ANYWHERE: Release mPackages lock earlier am: bab7c28e5e -s ours am: 655932af79 -s ours" into cw-f-dev
am: dbb5845378 -s ours

Change-Id: I247bf8ea05320da5fed80f3214023c5415d1b639

commit | commitdiff | tree

Todd Kennedy [Tue, 23 Aug 2016 16:18:57 +0000 (16:18 +0000)]

DO NOT MERGE ANYWHERE: Release mPackages lock earlier am: bab7c28e5e -s ours am: 655932af79 -s ours
am: 915771e5b6 -s ours

Change-Id: Iea1104733af8cb5c779c6d6c690d8322fa26e462

commit | commitdiff | tree

Dirk Dougherty [Tue, 23 Aug 2016 16:18:51 +0000 (16:18 +0000)]

Merge "Doc change: updates for final N landing page and related resources. am: b0ca00431f am: b78a9bc5fe am: 1dba7ddf3a" into cw-f-dev
am: 4e421445b0

Change-Id: I14ae49bce2dad03dd334a11b4f20f1c0a785bd0a

commit | commitdiff | tree

Dirk Dougherty [Tue, 23 Aug 2016 16:18:47 +0000 (16:18 +0000)]

Doc change: updates for final N landing page and related resources. am: b0ca00431f am: b78a9bc5fe am: 1dba7ddf3a
am: 643dcbda88

Change-Id: Ie212b1dafd3851a28d66937eded2bcbbf44adc1d

commit | commitdiff | tree

David Friedman [Tue, 23 Aug 2016 16:13:56 +0000 (16:13 +0000)]

Merge "Merge "Docs: Adding information to Building-for-Billions landing page." into nyc-dev am: 410ae5b004 am: e5036b3cab am: d6ad4f051e" into cw-f-dev
am: 5d653c4771

Change-Id: I81255bcdec7563b1fe9d9ea05bca67cf4a47e291

commit | commitdiff | tree

David Friedman [Tue, 23 Aug 2016 16:13:52 +0000 (16:13 +0000)]

Merge "Docs: Adding information to Building-for-Billions landing page." into nyc-dev am: 410ae5b004 am: e5036b3cab am: d6ad4f051e
am: af09673c38

Change-Id: I6ba0266c785d2a58ed14f83da6f029b017846a23

commit | commitdiff | tree

David Friedman [Tue, 23 Aug 2016 16:13:42 +0000 (16:13 +0000)]

Merge "Docs: Adding information to Building-for-Billions landing page. am: cbaf3f9986 am: 2663c419c0 am: 7208e94355" into cw-f-dev
am: b0da43c8f2

Change-Id: I0fbbec474de26929e796de7fc6324389764ac923

commit | commitdiff | tree

David Friedman [Tue, 23 Aug 2016 16:13:38 +0000 (16:13 +0000)]

Docs: Adding information to Building-for-Billions landing page. am: cbaf3f9986 am: 2663c419c0 am: 7208e94355
am: 904fa00b3e

Change-Id: I1d6ae6a7d94f7e3f70af8c5aed16695c21c7012e

commit | commitdiff | tree

David Friedman [Tue, 23 Aug 2016 16:13:24 +0000 (16:13 +0000)]

Merge "Merge "Docs: Adds a redirect to make it easier to access Performance section on DAC." into nyc-dev am: 162a0005ac am: c02c6b8fb0 am: 32d77972d5" into cw-f-dev
am: 9242f396a6

Change-Id: I1df2dbef9fa18c2a8f89ef9d5f79c87fb1d248ec

commit | commitdiff | tree

David Friedman [Tue, 23 Aug 2016 16:13:19 +0000 (16:13 +0000)]

Merge "Docs: Adds a redirect to make it easier to access Performance section on DAC." into nyc-dev am: 162a0005ac am: c02c6b8fb0 am: 32d77972d5
am: a655fe6c9d

Change-Id: I5258c60de002434672ebc7969c426edd548a0c34

commit | commitdiff | tree

Julius D'souza [Tue, 23 Aug 2016 16:13:01 +0000 (16:13 +0000)]

Merge "DO NOT MERGE: Add dynamic illuminance hysteresis support" into cw-f-dev
am: 529beb2cc5

Change-Id: Icdb0a74c9b11aad86b20250dd67e74627a95dbf5

commit | commitdiff | tree

Julius D'souza [Tue, 23 Aug 2016 16:12:51 +0000 (16:12 +0000)]

DO NOT MERGE: Add dynamic illuminance hysteresis support
am: 043a57186a

Change-Id: I08c0e87bcbba1964301e53ad0c9615c1e0e5a66d

commit | commitdiff | tree

David Friedman [Tue, 23 Aug 2016 16:12:39 +0000 (16:12 +0000)]

Docs: Adds a redirect to make it easier to access Performance section on DAC. am: 196cb73dbb am: f5c5eb0045 am: 5e1468cdbd
am: b4e27c0d72

Change-Id: I167921c609d3b9535c44f3188eb1ff42016d38a5

commit | commitdiff | tree

Scott Main [Tue, 23 Aug 2016 15:56:14 +0000 (15:56 +0000)]

Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev am: 77917a835f
am: 759c2855e8

Change-Id: I4e70f6d857e76dc66e3b0d10cf9620dc62937b0b

commit | commitdiff | tree

smain@google.com [Tue, 23 Aug 2016 15:56:11 +0000 (15:56 +0000)]

add workaround for annotations dependency conflict with espresso am: eee3518d11
am: b5971ef610

Change-Id: Ie4f93ff85ad67fb048460a49937cbf55db575262

commit | commitdiff | tree

Scott Main [Tue, 23 Aug 2016 15:47:18 +0000 (15:47 +0000)]

Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev
am: 77917a835f

Change-Id: Id3b88a94a23de579c20757f038dd83c0645e67bc

commit | commitdiff | tree

smain@google.com [Tue, 23 Aug 2016 15:47:14 +0000 (15:47 +0000)]

add workaround for annotations dependency conflict with espresso
am: eee3518d11

Change-Id: I8a609f9f542e2955efe333c13c065e00836c87ab

commit | commitdiff | tree

Jim Miller [Tue, 23 Aug 2016 15:47:03 +0000 (15:47 +0000)]

Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am: 02e9affa42 am: ddf70b9195 am: 364a51221a -s ours am: ce0856f702 am: 41d1827fd3 am: a7025c283c
am: 547d52ca3f

Change-Id: I1776f6daaa1b7f2fd7301bfbb3686357acb413da

commit | commitdiff | tree

Jim Miller [Tue, 23 Aug 2016 15:46:59 +0000 (15:46 +0000)]

Bind fingerprint when we start authentication - DO NOT MERGE am: b6f4b48df2 am: 9f04985991 am: 85c390e9fb -s ours am: f159feff98 am: ade6f4df5b am: 634aafc181
am: 0063bf03c9

Change-Id: I08f2820b4d3df2f01b085799b1dce9693f740a2d

commit | commitdiff | tree

Sudheer Shanka [Tue, 23 Aug 2016 15:46:52 +0000 (15:46 +0000)]

Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am: b51e98becb am: 7e890c8eb5 am: 08eb52f9f9 am: 58def3804c -s ours am: e49de5e073 am: 105453e170 am: 8887e258a9
am: 3cf87ce75e

Change-Id: I69bd46bc44c512ce09370116a5d75bcfd08e495b

commit | commitdiff | tree

Amith Yamasani [Tue, 23 Aug 2016 15:46:46 +0000 (15:46 +0000)]

DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4 am: 29ae7b1a27 am: 39c7879365 am: 5841c492a7 -s ours am: f705730667 am: d09a6aa0f0 am: 110bd114a8
am: 7136384209

Change-Id: I64227c17513e70615bd7e544e1e3e00fa38555e5

commit | commitdiff | tree

Sudheer Shanka [Tue, 23 Aug 2016 15:46:39 +0000 (15:46 +0000)]

Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev am: badc5cd942 am: f1e0a4a60c am: 3cf8ad97d0
am: 80533d81bd

Change-Id: Ia237d5a56a46cfd6d968f0d88989fdaeae10d792

commit | commitdiff | tree

Scott Main [Tue, 23 Aug 2016 15:42:01 +0000 (15:42 +0000)]

Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev

commit | commitdiff | tree

Fyodor Kupolov [Tue, 23 Aug 2016 15:37:05 +0000 (15:37 +0000)]

Merge "Added getDataPreloadsMediaDirectory" into nyc-dr1-dev am: 0a376f5619
am: 6af20d1c4e

Change-Id: Ibf6cfbc395224845f8132e8d3c614ab0302a920e

commit | commitdiff | tree

Fyodor Kupolov [Tue, 23 Aug 2016 15:36:19 +0000 (15:36 +0000)]

Added getDataPreloadsMediaDirectory am: 19551a8d8d
am: c98c7e9da1

Change-Id: Ibde055a6d442b74e17bc07991e8ea6bd2497fe6b

commit | commitdiff | tree

Jorim Jaggi [Tue, 23 Aug 2016 15:35:15 +0000 (15:35 +0000)]

Merge changes from topic 'am-c5d69672042b41758555eb3db8f077fe' into nyc-mr1-dev
am: f6f4f1ac61

Change-Id: Id3d8f253b1db24c1bb383bda9e005fcb8c59ad2f

commit | commitdiff | tree

Amith Yamasani [Tue, 23 Aug 2016 15:35:10 +0000 (15:35 +0000)]

DO NOT MERGE: Clean up when recycling a pid with a pending launch am: 55eacb9441 am: ac9bb3886d am: 250a509a68
am: 9b3f1e26e0

Change-Id: I72b1878607419e2374e15cd5e6b23b5fdec335fe

commit | commitdiff | tree

Jorim Jaggi [Tue, 23 Aug 2016 15:35:03 +0000 (15:35 +0000)]

Merge "Change retail mode wallpaper (1/2)" into nyc-dr1-dev am: c7136b3b3c
am: 9b2c0bf87e

Change-Id: I3631edf2a9f0e76b9670ba6bbfc1905c1503ff7c

commit | commitdiff | tree

Svetoslav Ganov [Tue, 23 Aug 2016 15:34:59 +0000 (15:34 +0000)]

Add resource based mechanism to grant default permissions am: d44d46aa50 am: fb53efd8f3
am: eb36e353a6

Change-Id: I9b635e29e7707e03952adf2d657e275eb81147e0

commit | commitdiff | tree

Rob Carr [Tue, 23 Aug 2016 15:34:50 +0000 (15:34 +0000)]

Merge "Only allow focused window to select seamless rotation." into nyc-mr1-dev am: 7ae506260e
am: f40e1533b5

Change-Id: Ide42f202a2bd4ae30e7bc7a8471818751e9962b9

commit | commitdiff | tree

Robert Carr [Tue, 23 Aug 2016 15:34:42 +0000 (15:34 +0000)]

Only allow focused window to select seamless rotation. am: 828ec3dc51
am: d2bacdaf6d

Change-Id: I1c3a083f34c224f04343cbd1ae390068c686cde8

commit | commitdiff | tree

Dianne Hackborn [Tue, 23 Aug 2016 15:34:34 +0000 (15:34 +0000)]

Merge "Fix issue #30929080: Default Assist app is set to None..." into nyc-mr1-dev am: d6ece3e175
am: ddca04dcbe

Change-Id: Idefe2cc12a7ad4f79ead642bd041bdd09033d7b3

commit | commitdiff | tree

Jorim Jaggi [Tue, 23 Aug 2016 15:34:06 +0000 (15:34 +0000)]

Change retail mode wallpaper (1/2) am: 6c902d0453
am: 9d0879c6ac

Change-Id: I639e21420319261126227da7296e876a07976dc1

commit | commitdiff | tree

Adam Powell [Tue, 23 Aug 2016 15:33:59 +0000 (15:33 +0000)]

Merge "Merge "Only dispatch window visibility aggregation for targetSdk >= N" into nyc-dr1-dev am: 081e393103" into nyc-mr1-dev
am: b352d0a45a

Change-Id: Ied7ef0ddeb4bbc5c80f5ccce5aa817b0a9244655

commit | commitdiff | tree

Adam Powell [Tue, 23 Aug 2016 15:33:57 +0000 (15:33 +0000)]

Merge "Only dispatch window visibility aggregation for targetSdk >= N" into nyc-dr1-dev am: 081e393103
am: 1b192da3fe

Change-Id: If8df0bd5aec1d32da478d7c12ee7c16d6bf388a7

commit | commitdiff | tree

Adam Powell [Tue, 23 Aug 2016 15:33:51 +0000 (15:33 +0000)]

Merge "Only dispatch window visibility aggregation for targetSdk >= N am: 64e1ba4398" into nyc-mr1-dev
am: 998ff1c7be

Change-Id: I73b8052c7f2340c53ba1055bff6533cb19671018

commit | commitdiff | tree

Adam Powell [Tue, 23 Aug 2016 15:33:49 +0000 (15:33 +0000)]

Only dispatch window visibility aggregation for targetSdk >= N am: 64e1ba4398
am: 02abbe8d4c

Change-Id: I66f8610e52f2aaf06b02fa8d369692fc2f89ee17

commit | commitdiff | tree

Dirk Dougherty [Tue, 23 Aug 2016 15:25:23 +0000 (15:25 +0000)]

Merge "Doc change: intl page updates for final n release. am: e816f1f542 am: 79d9e9df2e" into nyc-mr1-dev
am: f14ba4c10f

Change-Id: Ie7c4ee20cfc16a135bb5a2116442215bb2afd74b

commit | commitdiff | tree

Dirk Dougherty [Tue, 23 Aug 2016 15:25:21 +0000 (15:25 +0000)]

Doc change: intl page updates for final n release. am: e816f1f542 am: 79d9e9df2e
am: 4a273d8bb9

Change-Id: Iefccf2db7748d32325e8f3657f53a9aabb3d83c2

commit | commitdiff | tree

Chris Tate [Tue, 23 Aug 2016 15:25:15 +0000 (15:25 +0000)]

Merge "Merge "Fix wallpaper backup eligibility test" into nyc-dr1-dev am: 56ce19099d" into nyc-mr1-dev
am: 2733c16556

Change-Id: I44879ede18607dfa21984f3d059cfdd80193b246

commit | commitdiff | tree

Chris Tate [Tue, 23 Aug 2016 15:25:13 +0000 (15:25 +0000)]

Merge "Fix wallpaper backup eligibility test" into nyc-dr1-dev am: 56ce19099d
am: ad3f9a03ea

Change-Id: I329ca50f9bc4049be3da5f936ab432f47f33a9ba

commit | commitdiff | tree

Christopher Tate [Tue, 23 Aug 2016 15:25:08 +0000 (15:25 +0000)]

Merge "Fix wallpaper backup eligibility test am: f7d1b5de6e" into nyc-mr1-dev
am: e022290806

Change-Id: Ib016b9731e1efa1980112ed2d38e8553ff0973d0

commit | commitdiff | tree

Christopher Tate [Tue, 23 Aug 2016 15:25:06 +0000 (15:25 +0000)]

Fix wallpaper backup eligibility test am: f7d1b5de6e
am: 100b610066

Change-Id: I243b821aa35b75ad69ed9ddcf45ef6a4342e4605

commit | commitdiff | tree

Adam Seaton [Tue, 23 Aug 2016 15:25:01 +0000 (15:25 +0000)]

Merge "Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Prevent FIFO threads from creating more FIFO threads." into nyc-dr1-dev am: 051d6b74eb -s ours" into nyc-mr1-dev
am: f7e165972f -s ours

Change-Id: I02c1cbaec6994edc21b25413101f6dccbb1c091f

commit | commitdiff | tree

Adam Seaton [Tue, 23 Aug 2016 15:25:00 +0000 (15:25 +0000)]

Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Prevent FIFO threads from creating more FIFO threads." into nyc-dr1-dev am: 051d6b74eb -s ours
am: 6b5a4bf98b -s ours

Change-Id: I6ca4a4f6d3a7269ec69ec3c9f0966237ab9cc5c3

commit | commitdiff | tree

Dianne Hackborn [Tue, 23 Aug 2016 15:25:00 +0000 (15:25 +0000)]

Fix issue #30929080: Default Assist app is set to None... am: e9563659a5
am: 5cb766a9cd

Change-Id: Ida55c001bd6f4ec0be8235b88fb806a617ed15cc

commit | commitdiff | tree

Todd Kennedy [Tue, 23 Aug 2016 15:24:57 +0000 (15:24 +0000)]

Merge "Allow permission group updates" into nyc-mr1-dev am: ee2df0390e
am: a09f3f28ef

Change-Id: I2ef7ea000d0cc65becb40a8ecdd9d1859758c944

commit | commitdiff | tree

Tim Murray [Tue, 23 Aug 2016 15:24:55 +0000 (15:24 +0000)]

Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Prevent FIFO threads from creating more FIFO threads. am: d72b26085c -s ours" into nyc-mr1-dev
am: 6a1c2227be -s ours

Change-Id: I4a384d1e1ea2cfb822fe56bbc3c0197891919678

commit | commitdiff | tree

Tim Murray [Tue, 23 Aug 2016 15:24:54 +0000 (15:24 +0000)]

DO NOT MERGE ANYWHERE (nyc-dr1-dev) Prevent FIFO threads from creating more FIFO threads. am: d72b26085c -s ours
am: fbc47f734f -s ours

Change-Id: I2174dc610823bc9a9ea58bbd55a30095db569c09

commit | commitdiff | tree

Todd Kennedy [Tue, 23 Aug 2016 15:24:53 +0000 (15:24 +0000)]

Allow permission group updates am: 21bd9b824f
am: 873b0f563e

Change-Id: I387ffcb88341a112ff8a1aff3b38b32b4b65e382

commit | commitdiff | tree

Todd Kennedy [Tue, 23 Aug 2016 15:24:48 +0000 (15:24 +0000)]

Merge "Don't call into pkg mgr svc w/ lock held" into nyc-mr1-dev am: 0060d6eda1
am: 5cc6bf0ead

Change-Id: If8de2f5e7751ec1e65b7bdb499ecde0037fbec9b

commit | commitdiff | tree

Todd Kennedy [Tue, 23 Aug 2016 15:24:44 +0000 (15:24 +0000)]

Don't call into pkg mgr svc w/ lock held am: f29d07a62a
am: 76a12e177c

Change-Id: Ic1f21fd64990a282375be7709aba79297c9dd6f9

commit | commitdiff | tree

Tenghui Zhu [Tue, 23 Aug 2016 15:15:16 +0000 (15:15 +0000)]

Merge "Correctly report the transparent region" into nyc-mr1-dev am: f05765e3c4
am: 52feb6b956

Change-Id: I746a21537ec34285fda505a5919740ab04693b3d

commit | commitdiff | tree

Teng-Hui Zhu [Tue, 23 Aug 2016 15:15:06 +0000 (15:15 +0000)]

Correctly report the transparent region am: f8da30dc65
am: 94a2f7e6fd

Change-Id: Ice979b549a74f1e8e59210f2b7c7e5a6f141b9f6

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 23 Aug 2016 15:14:56 +0000 (15:14 +0000)]

Merge "Merge "If Vodafone Italy sim is in Spain consider it as roaming on Spain nw." into nyc-mr1-dev am: 4a6f3bb921" into cw-f-dev

commit | commitdiff | tree

Salvador Martinez [Tue, 23 Aug 2016 15:14:54 +0000 (15:14 +0000)]

Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev am: 09b64ade22
am: 0c216301b6

Change-Id: Ic534d6c68c3b43d7b9bd811e257abb695d7c1874

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 23 Aug 2016 15:14:37 +0000 (15:14 +0000)]

Merge "If Vodafone Italy sim is in Spain consider it as roaming on Spain nw. am: 0cc68dbf29" into cw-f-dev

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 23 Aug 2016 15:14:20 +0000 (15:14 +0000)]

Merge "Merge "DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information" into nyc-dr1-dev am: ad1008d089 -s ours am: aad9147dca -s ours" into cw-f-dev

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 23 Aug 2016 15:14:03 +0000 (15:14 +0000)]

Merge "DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information am: 05a1df9967 -s ours am: 33a04f8333 -s ours" into cw-f-dev

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 23 Aug 2016 15:13:45 +0000 (15:13 +0000)]

Merge "Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity." into nyc-dr1-dev am: 0f1e7ab1d3 -s ours am: fcd16254c6 -s ours" into cw-f-dev

commit | commitdiff | tree

Salvador Martinez [Tue, 23 Aug 2016 15:13:37 +0000 (15:13 +0000)]

Prevent wifi icon from disappearing am: 823cd0e35a
am: aebce41a88

Change-Id: Ic05c1f77725904011e3cf5db44accb7c9847eefa

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 23 Aug 2016 15:13:26 +0000 (15:13 +0000)]

Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity. am: c9373e5505 -s ours am: 27d769e3b0 -s ours" into cw-f-dev

commit | commitdiff | tree

Rob Carr [Tue, 23 Aug 2016 15:13:04 +0000 (15:13 +0000)]

Merge "PopupWindow: Be more consistent about Gravity calculation." into nyc-mr1-dev am: b19915bea8
am: b97dc0a5a8

Change-Id: I3d27d8ae4e25fdb1977e6c57ee02aa80b3a8a4ef

commit | commitdiff | tree

Sanket Padawe [Tue, 23 Aug 2016 15:12:31 +0000 (15:12 +0000)]

Merge "If Vodafone Italy sim is in Spain consider it as roaming on Spain nw." into nyc-mr1-dev
am: 4a6f3bb921

Change-Id: Iae5f5a526b45c583eec1439bd43a6548b319c142

commit | commitdiff | tree

Sanket Padawe [Tue, 23 Aug 2016 15:12:29 +0000 (15:12 +0000)]

If Vodafone Italy sim is in Spain consider it as roaming on Spain nw.
am: 0cc68dbf29

Change-Id: I2aa45f5db13bc867a23663a14ab6330285a6e872

commit | commitdiff | tree

Adam Seaton [Tue, 23 Aug 2016 15:12:26 +0000 (15:12 +0000)]

Merge "DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information" into nyc-dr1-dev am: ad1008d089 -s ours
am: aad9147dca -s ours

Change-Id: I7e5040b8246458a5a24afa28fec9469a4b223652

commit | commitdiff | tree

Andy Hung [Tue, 23 Aug 2016 15:12:25 +0000 (15:12 +0000)]

DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information am: 05a1df9967 -s ours
am: 33a04f8333 -s ours

Change-Id: I123cf216c3654a4572d64400b91265f956d53ac7

commit | commitdiff | tree

Adam Seaton [Tue, 23 Aug 2016 15:12:23 +0000 (15:12 +0000)]

Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity." into nyc-dr1-dev am: 0f1e7ab1d3 -s ours
am: fcd16254c6 -s ours

Change-Id: Iff2337eeb9148078fc5f2774d5c72dbd39360fec

commit | commitdiff | tree

George Mount [Tue, 23 Aug 2016 15:12:22 +0000 (15:12 +0000)]

DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity. am: c9373e5505 -s ours
am: 27d769e3b0 -s ours

Change-Id: Ie414fbc28d07642febe6c6dcf2e30283fbc802c0