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

Selim Cinek [Tue, 23 Aug 2016 19:09:37 +0000 (19:09 +0000)]

Merge "Made background updater more robust to state changes" into nyc-mr1-dev
am: c6c45d225c

Change-Id: I2bccc8eb4829e6bc4f3f3d4e246eeb0027378987

commit | commitdiff | tree

Selim Cinek [Tue, 23 Aug 2016 19:09:35 +0000 (19:09 +0000)]

Made background updater more robust to state changes
am: 9bfba9c157

Change-Id: I32e762641b7efd9ce10f0b7d6b21b986c58c617e

commit | commitdiff | tree

Selim Cinek [Tue, 23 Aug 2016 19:09:31 +0000 (19:09 +0000)]

Merge "Avoid weird expand animation when a notification is updated" into nyc-mr1-dev
am: c55457b146

Change-Id: I3f14c90f69d9e32c659afb2d9465de6c4752d990

commit | commitdiff | tree

Selim Cinek [Tue, 23 Aug 2016 19:09:28 +0000 (19:09 +0000)]

Avoid weird expand animation when a notification is updated
am: bb42b7dd48

Change-Id: I68f50687c08ff6f9100d4bfcc2ac35ec52b98e09

commit | commitdiff | tree

TreeHugger Robot [Tue, 23 Aug 2016 18:55:45 +0000 (18:55 +0000)]

Merge "Made background updater more robust to state changes" into nyc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 23 Aug 2016 18:53:20 +0000 (18:53 +0000)]

Merge "Avoid weird expand animation when a notification is updated" into nyc-mr1-dev

commit | commitdiff | tree

Andrew Rossignol [Tue, 23 Aug 2016 18:40:54 +0000 (18:40 +0000)]

Merge changes Ib9d0f4fc,I47195f91,Ib26ef543 into cw-f-dev

* changes:
  Remove unused webkit assets.
  Remove bootanimation sounds.
  Reduce the size of boot animaion assets.

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 23 Aug 2016 17:55:23 +0000 (17:55 +0000)]

Merge "No need to check package name am: ef8d8ea24a am: e0736b4fb0" into cw-f-dev

commit | commitdiff | tree

Todd Kennedy [Tue, 23 Aug 2016 17:54:51 +0000 (17:54 +0000)]

No need to check package name am: ef8d8ea24a
am: e0736b4fb0

Change-Id: I65af34f8d56ed62c84cd97d63aaa882c08e9898a

Merge "DO NOT MERGE Cherry-Pick: Add ViewConfiguration.getScaledScrollFactor()" into cw-f-dev

commit | commitdiff | tree

Julius D'souza [Tue, 23 Aug 2016 17:39:14 +0000 (17:39 +0000)]

DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support am: 3275a3a5a5 -s ours am: d5bf4039a9 -s ours am: b2507eb7b7 -s ours am: 027f685296 -s ours
am: 8b271611f0 -s ours

Change-Id: I81859f24055ef8b69464f16cdd5b2a53a429a4cc

commit | commitdiff | tree

Sailesh Nepal [Tue, 23 Aug 2016 17:39:06 +0000 (17:39 +0000)]

Merge "Add carrier regex config values for VisualVoicemailSmsFilter" into nyc-dr1-dev am: 74de00a62c
am: fa4f3b25e4

Change-Id: I59db620dbd2b696b017c8f51bd4115f23d8ab4af

commit | commitdiff | tree

Todd Kennedy [Tue, 23 Aug 2016 17:39:01 +0000 (17:39 +0000)]

No need to check package name
am: ef8d8ea24a

Change-Id: Idd8b189070e3e5920cd1b9d12a8ba282de44d11a

commit | commitdiff | tree

Ta-wei Yen [Tue, 23 Aug 2016 17:38:22 +0000 (17:38 +0000)]

Add carrier regex config values for VisualVoicemailSmsFilter am: 9a107a2df0
am: 16394b84d9

Change-Id: I8820201e0c741a8b2b1cd3b60abada1941f4230d

commit | commitdiff | tree

Julius D'souza [Tue, 23 Aug 2016 17:11:39 +0000 (17:11 +0000)]

DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support am: 3275a3a5a5 -s ours am: d5bf4039a9 -s ours am: b2507eb7b7 -s ours
am: 027f685296 -s ours

Change-Id: Ibc3e2a639ecc8a9b49d899ae6298761dabbd2032

commit | commitdiff | tree

Sailesh Nepal [Tue, 23 Aug 2016 17:11:35 +0000 (17:11 +0000)]

Merge "Add carrier regex config values for VisualVoicemailSmsFilter" into nyc-dr1-dev
am: 74de00a62c

Change-Id: Ibf1283af6133ccd43f75f361fe9a821e87668773

commit | commitdiff | tree

Ta-wei Yen [Tue, 23 Aug 2016 17:11:27 +0000 (17:11 +0000)]

Add carrier regex config values for VisualVoicemailSmsFilter
am: 9a107a2df0

Change-Id: Ie71269986f671ee8d773665107e5504f905da769

commit | commitdiff | tree

Todd Kennedy [Mon, 22 Aug 2016 22:44:00 +0000 (15:44 -0700)]

No need to check package name

Change-Id: I8c403ca2bc38f2c7191b6e9a709286ac7e450ac4
Fixes: 30958291
(cherry picked from commit afb5269ad6a507a3230b519b3156ac0bcc5fc3a0)

commit | commitdiff | tree

Julius D'souza [Tue, 23 Aug 2016 17:08:33 +0000 (17:08 +0000)]

DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support am: 3275a3a5a5 -s ours am: d5bf4039a9 -s ours
am: b2507eb7b7 -s ours

Change-Id: I73d049d6855b9cd9420a194bda7079adc2283bb0

commit | commitdiff | tree

Sailesh Nepal [Tue, 23 Aug 2016 17:00:30 +0000 (17:00 +0000)]

Merge "Add carrier regex config values for VisualVoicemailSmsFilter" into nyc-dr1-dev

commit | commitdiff | tree

Adrian Roos [Tue, 23 Aug 2016 16:52:26 +0000 (16:52 +0000)]

Merge "AppErrors: Don't suppress dialogs when ANR_SHOW_BACKGROUND is set" into nyc-mr1-dev
am: 374f9a690b

Change-Id: Id3e844d9cb4c6023474f45c5a09ee82e8eda6a4c

commit | commitdiff | tree

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

DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support am: 3275a3a5a5 -s ours
am: d5bf4039a9 -s ours

Change-Id: I4f1a0acabe5d5385af086791b906ff6f45424e59

commit | commitdiff | tree

Adrian Roos [Tue, 23 Aug 2016 16:52:23 +0000 (16:52 +0000)]

AppErrors: Don't suppress dialogs when ANR_SHOW_BACKGROUND is set
am: 6a7e08920c

Change-Id: I0a3713010a0c6e487257995bd34165348f5fc2a4

commit | commitdiff | tree

Adrian Roos [Tue, 23 Aug 2016 16:52:18 +0000 (16:52 +0000)]

Merge "Ambient: Pulse for every noisy notification exactly once" into nyc-mr1-dev
am: bd43552975

Change-Id: Iacac780fdf7359afdb0e9e443038b3e3b842f53a

commit | commitdiff | tree

Adrian Roos [Tue, 23 Aug 2016 16:52:15 +0000 (16:52 +0000)]

Ambient: Pulse for every noisy notification exactly once
am: d13602f1e7

Change-Id: I45cf1a129ae53d251bd033a8f15618b3868cd351

commit | commitdiff | tree

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

DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support
am: 3275a3a5a5 -s ours

Change-Id: Iaae7763a4d744ad8a63538750c5ed3efe38161d5

commit | commitdiff | tree

TreeHugger Robot [Tue, 23 Aug 2016 16:39:44 +0000 (16:39 +0000)]

Merge "AppErrors: Don't suppress dialogs when ANR_SHOW_BACKGROUND is set" into nyc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 23 Aug 2016 16:38:17 +0000 (16:38 +0000)]

Merge "Ambient: Pulse for every noisy notification exactly once" into nyc-mr1-dev

commit | commitdiff | tree

Scott Main [Tue, 23 Aug 2016 16:19:17 +0000 (16:19 +0000)]

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

Change-Id: Ib50e5c0fb691fecaca450b9713c90aa1a7818c28

commit | commitdiff | tree

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

add workaround for annotations dependency conflict with espresso am: eee3518d11 am: 349edcf169
am: da2802d1f9

Change-Id: Ia7d3ce025d564c188544fa11950ac89dd1aa12e2

Merge "Documentation warning against short-lived Contexts" into nyc-mr1-dev
am: a1e4149cfd

Change-Id: Ide29b3200f1ed345c0fc2abcc984606dc8432d6c

Documentation warning against short-lived Contexts
am: da23618043

Change-Id: Ie6e4c05d8d9a273f0f529c2be79f3df4a856fedb

Merge "Handle null packageName in PendingIntentRecord" into nyc-mr1-dev
am: 6acd5e7361

Change-Id: I1a287ffe131ee4d94739a3cc3271e1e923bfed3f

Handle null packageName in PendingIntentRecord
am: 5bf8a33aaf

Change-Id: Idf958ed50d6ac3918f4b1b24fa6685ce708e87c1

Merge "Not longer need MANAGE_DEVICE_ADMINS permission." into nyc-mr1-dev
am: a96e906e80

Change-Id: I3bfa9c65b1ef3b79df67d58b4cb64b4bb4363d32

Not longer need MANAGE_DEVICE_ADMINS permission.
am: 1573d8be78

Change-Id: I4eb9ccc440f2c84b5528a28632a9d2c9bbec2617

Merge "Force application context for KeyChain bindings" into nyc-mr1-dev
am: cabc4f5945

Change-Id: Ia4ba4050a38ed117b908ba084553f97c74c6a1f1

Force application context for KeyChain bindings
am: f04a663d6a

Change-Id: I16c31a9c31527a79addbd2b44003f8fe56cb652f

commit | commitdiff | tree

Adrian Roos [Tue, 23 Aug 2016 16:06:35 +0000 (16:06 +0000)]

Merge "HIC: Improve AccelerationClassifier" into nyc-dr1-dev am: 06165f534f
am: ee99f0ae46

Change-Id: I8c7c1d919237e487a41aa2b9245d81dd615c7352

commit | commitdiff | tree

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

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

Change-Id: Ifff17568fd5ac67443fa7cfbbb0526f0b16b3c34

commit | commitdiff | tree

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

add workaround for annotations dependency conflict with espresso am: eee3518d11
am: 349edcf169

Change-Id: I178c7bc7c2639559e8b4848f1a2af0bcdffcc849

commit | commitdiff | tree

Adrian Roos [Tue, 23 Aug 2016 15:48:55 +0000 (15:48 +0000)]

HIC: Improve AccelerationClassifier am: 4dc14b231e
am: 4a0f6aeb08

Change-Id: I330ac75a9409752f7f0632b11ea2cd5111d522e4

commit | commitdiff | tree

Lorenzo Colitti [Tue, 23 Aug 2016 15:48:48 +0000 (15:48 +0000)]

Refactor NetworkNotificationManager. am: 0b59906768
am: a6dcb89e6d

Change-Id: I635e0dfca74a1dc3e0291c42aeed7c3a6a978dbd

commit | commitdiff | tree

Lorenzo Colitti [Tue, 23 Aug 2016 15:47:38 +0000 (15:47 +0000)]

Move notification code out of ConnectivityService. am: f3ae2eeae4
am: 622b5fbbf5

Change-Id: Iecbc0416842fa8d8ed4efb2ca666793240f7a2cc

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 4e3fe5c7d8 -s ours

Change-Id: I5d962b9e1e82a57ab43f32f6303242fe8a887125

Import translations. DO NOT MERGE
am: f2e311f117 -s ours

Change-Id: I08109e0d9358d5d60d9c4d7608f683da010313a0

commit | commitdiff | tree

Daichi Hirono [Tue, 23 Aug 2016 15:47:30 +0000 (15:47 +0000)]

Merge "Set Root.FLAG_LOCAL_ONLY for MTP roots." into nyc-mr1-dev
am: 5e252cecd1

Change-Id: Ic6ff84db074e5fa9770833cff4fcfa720f78cf6f

commit | commitdiff | tree

Daichi Hirono [Tue, 23 Aug 2016 15:47:27 +0000 (15:47 +0000)]

Set Root.FLAG_LOCAL_ONLY for MTP roots.
am: b7573e93cd

Change-Id: I80771a8ab9bffac23a63087ae615ece83cc42d18

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: Ibc54a5b58aad47a49bf5cb5a69ae3ddf461ccd15

commit | commitdiff | tree

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

add workaround for annotations dependency conflict with espresso
am: eee3518d11

Change-Id: I05f1b9063433e060427f627c46aab64972fe45cf

commit | commitdiff | tree

Ta-wei Yen [Fri, 19 Aug 2016 18:43:15 +0000 (11:43 -0700)]

Add carrier regex config values for VisualVoicemailSmsFilter

Verizon requires all SMS that starts with "//VZWVVM" to be treated
as a VVM SMS.

EXTRA_VOICEMAIL_SMS_MESSAGE_BODY is also added to VociemailContract
to send the message body of a SMS that matches the carrier regex but
is not parsable.

Bug: 30954955
Change-Id: Ib5449164a5290b132648cc28b1e1d3d9ddd5fea0
(cherry picked from commit ad31603b80e13e914ff4c3a41b5c04558d04d3ca)

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

Updated user document for Single-Source RenderScript am: c069ed7f8c am: 044cd35a46
am: 92b787bbf7

Change-Id: Ieb9f754c0bc43813439551d743dc055472f2da20

commit | commitdiff | tree

Todd Kennedy [Tue, 23 Aug 2016 15:37:28 +0000 (15:37 +0000)]

Merge "No need to check package name" into nyc-mr1-dev
am: 40db730b7f

Change-Id: Ie9c2477585243f80392194d8d9b41ad693d6aab3

commit | commitdiff | tree

Todd Kennedy [Tue, 23 Aug 2016 15:37:26 +0000 (15:37 +0000)]

No need to check package name
am: afb5269ad6

Change-Id: Ic3f3eebbb40ef5ae55e0c62003550473d23a3eb2

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

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

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

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

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

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

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

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

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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 23 Aug 2016 15:10:33 +0000 (15:10 +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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 23 Aug 2016 15:10:09 +0000 (15:10 +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

commit | commitdiff | tree

Todd Kennedy [Tue, 23 Aug 2016 15:09:17 +0000 (15:09 +0000)]

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

Change-Id: If5e283f29ca14e7eb7d2dbf7edefe3f5a2be4223

commit | commitdiff | tree

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

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

Change-Id: I21b0522b626433fa932618092b97f42acf108f6d

commit | commitdiff | tree

David Friedman [Tue, 23 Aug 2016 15:09:12 +0000 (15:09 +0000)]

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

Change-Id: Ic8ad057a85b59e3140881b4deccfb0c0add24960

commit | commitdiff | tree

David Friedman [Tue, 23 Aug 2016 15:09:10 +0000 (15:09 +0000)]

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

Change-Id: I04ef62e6851ee429fbc2607beb54a54b6a4120a4

commit | commitdiff | tree

Julius D'souza [Tue, 23 Aug 2016 15:09:08 +0000 (15:09 +0000)]

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

commit | commitdiff | tree

David Friedman [Tue, 23 Aug 2016 15:09:07 +0000 (15:09 +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

Change-Id: Iccae3409ae8a7797ebd8ffa67aad496f51a890c7

commit | commitdiff | tree

David Friedman [Tue, 23 Aug 2016 15:00:17 +0000 (15:00 +0000)]

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

Change-Id: I5e81ab82e8e3e9c321b57d31333c4a40283e86ba

commit | commitdiff | tree

Jim Miller [Tue, 23 Aug 2016 15:00:15 +0000 (15:00 +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

Change-Id: Id53a357acd6b5ac900963d216aaf441471991f3a

commit | commitdiff | tree

Jim Miller [Tue, 23 Aug 2016 15:00:13 +0000 (15:00 +0000)]

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

Change-Id: I17a1313244d56f6e416f5a0252ee3f6681e19763