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

Jakub Pawlowski [Wed, 31 Aug 2016 18:28:45 +0000 (18:28 +0000)]

Merge "Separate advertiser from GATT client (1/4)" am: 5f87c4539a am: 40a16ea242
am: 9f341e4e49

Change-Id: Ic3461b98449636cfc125890f255b1332d0ef5132

commit | commitdiff | tree

Scott Main [Wed, 31 Aug 2016 18:24:52 +0000 (18:24 +0000)]

Merge "resolve merge conflicts of e8a3ea8 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jakub Pawlowski [Wed, 31 Aug 2016 18:21:00 +0000 (18:21 +0000)]

Merge "Separate advertiser from GATT client (1/4)" am: 5f87c4539a
am: 40a16ea242

Change-Id: I0d08f623e78fdd779b39083d0da3a45aee72ff3c

commit | commitdiff | tree

Jakub Pawlowski [Wed, 31 Aug 2016 18:14:17 +0000 (18:14 +0000)]

Merge "Separate advertiser from GATT client (1/4)"
am: 5f87c4539a

Change-Id: I0cc39d08fdef8637e156414e3ef4e669a01f921f

commit | commitdiff | tree

Jakub Pawlowski [Wed, 31 Aug 2016 18:05:26 +0000 (18:05 +0000)]

Merge "Separate advertiser from GATT client (1/4)"

commit | commitdiff | tree

Chih-hung Hsieh [Wed, 31 Aug 2016 17:43:44 +0000 (17:43 +0000)]

Merge "Fix google-explicit-constructor warnings in libs/hwui." am: 7207562ff7 am: d7a69e04eb
am: 842f1e48e7

Change-Id: I401bb7ef3a46bb317ba664667fab4a16c129e5aa

commit | commitdiff | tree

Chih-hung Hsieh [Wed, 31 Aug 2016 17:40:08 +0000 (17:40 +0000)]

Merge "Fix google-explicit-constructor warnings in media/mca." am: 2cace65f71 am: 4836d07980
am: edd824b94a

Change-Id: I83d815f5d739c47407f3faf1b25034e52492d638

commit | commitdiff | tree

Chih-hung Hsieh [Wed, 31 Aug 2016 17:39:44 +0000 (17:39 +0000)]

Merge "Fix google-explicit-constructor warnings in libs/hwui." am: 7207562ff7
am: d7a69e04eb

Change-Id: I78ea5c2e7036c5d5c7f5573b4eef208b0ff93b99

commit | commitdiff | tree

Chih-hung Hsieh [Wed, 31 Aug 2016 17:34:41 +0000 (17:34 +0000)]

Merge "Fix google-explicit-constructor warnings in libs/hwui."
am: 7207562ff7

Change-Id: I746697717344af1663b47906580489c7ebc5c379

commit | commitdiff | tree

Chih-hung Hsieh [Wed, 31 Aug 2016 17:34:11 +0000 (17:34 +0000)]

Merge "Fix google-explicit-constructor warnings in media/mca." am: 2cace65f71
am: 4836d07980

Change-Id: Ib0369e46dd1f1e56b3f660e615bc34c87120acaa

commit | commitdiff | tree

Chih-hung Hsieh [Wed, 31 Aug 2016 17:27:58 +0000 (17:27 +0000)]

Merge "Fix google-explicit-constructor warnings in media/mca."
am: 2cace65f71

Change-Id: I4eb234c60ce33f34e91b40661736231237c472b2

commit | commitdiff | tree

Chih-hung Hsieh [Wed, 31 Aug 2016 17:18:56 +0000 (17:18 +0000)]

Merge "Fix google-explicit-constructor warnings in libs/hwui."

commit | commitdiff | tree

Chih-hung Hsieh [Wed, 31 Aug 2016 17:18:29 +0000 (17:18 +0000)]

Merge "Fix google-explicit-constructor warnings in media/mca."

commit | commitdiff | tree

Neil Fuller [Wed, 31 Aug 2016 16:47:33 +0000 (16:47 +0000)]

Merge "Fix receive timeout on LocalSocket" am: 7a9c0cd854 am: 680ec020a1
am: ef1fb4889a

Change-Id: Ie4befe516f369d903a61f22aab15e40ac09193a3

commit | commitdiff | tree

Neil Fuller [Wed, 31 Aug 2016 16:43:22 +0000 (16:43 +0000)]

Merge "Fix receive timeout on LocalSocket" am: 7a9c0cd854
am: 680ec020a1

Change-Id: I9b5622a91cf459844ee3513191b45994d51c86a7

commit | commitdiff | tree

Neil Fuller [Wed, 31 Aug 2016 16:35:24 +0000 (16:35 +0000)]

Merge "Fix receive timeout on LocalSocket"
am: 7a9c0cd854

Change-Id: I4148f467921ad6a627fe8ebc5225e2de6717270f

commit | commitdiff | tree

Neil Fuller [Wed, 31 Aug 2016 16:28:16 +0000 (16:28 +0000)]

Merge "Fix receive timeout on LocalSocket"

commit | commitdiff | tree

smain@google.com [Wed, 31 Aug 2016 15:42:09 +0000 (08:42 -0700)]

resolve merge conflicts of e8a3ea8 to nyc-mr1-dev-plus-aosp

Change-Id: Ied5ddc04e6da65cba62698cd18ba78496f5fb646

commit | commitdiff | tree

Sergio Giro [Wed, 31 Aug 2016 14:21:41 +0000 (14:21 +0000)]

Merge "java.security.Principal: add default method Principal#implies" am: 0c8c4a5d98 am: e639bbd7d0
am: 61c0996d6f

Change-Id: I4ea45e1007f5bbbd086d200f5be9227a03eab44d

commit | commitdiff | tree

Sergio Giro [Wed, 31 Aug 2016 14:15:46 +0000 (14:15 +0000)]

Merge "java.security.Principal: add default method Principal#implies" am: 0c8c4a5d98
am: e639bbd7d0

Change-Id: I4fa9f37094b3679868732b93eab2dfe1e6429d7d

commit | commitdiff | tree

Sergio Giro [Wed, 31 Aug 2016 14:09:44 +0000 (14:09 +0000)]

Merge "java.security.SecretKey: now extends from Destroyable" am: c7bd0d0adc am: 8a5790a287
am: d4b193c30c

Change-Id: I34fac82dc8bfbd157b70b637a13d188692b3b5e2

commit | commitdiff | tree

Sergio Giro [Wed, 31 Aug 2016 14:09:42 +0000 (14:09 +0000)]

Merge "java.security.Principal: add default method Principal#implies"
am: 0c8c4a5d98

Change-Id: I4708b9cee5059b588e829853264484782e251efb

commit | commitdiff | tree

Sergio Giro [Wed, 31 Aug 2016 14:04:09 +0000 (14:04 +0000)]

Merge "java.security.SecretKey: now extends from Destroyable" am: c7bd0d0adc
am: 8a5790a287

Change-Id: Icebe2f83f4532c5ad57fe385d365c93732d97145

commit | commitdiff | tree

Sergio Giro [Wed, 31 Aug 2016 13:58:11 +0000 (13:58 +0000)]

Merge "java.security.SecretKey: now extends from Destroyable"
am: c7bd0d0adc

Change-Id: I3382bd7f225e6a487dbf4b6aa74000981f40a70e

commit | commitdiff | tree

Sergio Giro [Wed, 31 Aug 2016 13:51:37 +0000 (13:51 +0000)]

Merge "java.security.Principal: add default method Principal#implies"

commit | commitdiff | tree

Sergio Giro [Wed, 31 Aug 2016 13:50:22 +0000 (13:50 +0000)]

Merge "java.security.SecretKey: now extends from Destroyable"

commit | commitdiff | tree

Sergio Giro [Wed, 31 Aug 2016 12:51:16 +0000 (12:51 +0000)]

Merge "java.security: update java.security.KeyStore to jdk8u60" am: d53ae2c285 am: 565c1fbf8b
am: e04c029ed5

Change-Id: Ib38154e6828802889d4f4e385e109de925ece1bc

commit | commitdiff | tree

Sergio Giro [Wed, 31 Aug 2016 12:42:32 +0000 (12:42 +0000)]

Merge "java.security: update java.security.KeyStore to jdk8u60" am: d53ae2c285
am: 565c1fbf8b

Change-Id: Iec116355209c0770b4125142f93873766e29d61d

commit | commitdiff | tree

Sergio Giro [Wed, 31 Aug 2016 12:31:33 +0000 (12:31 +0000)]

Merge "java.security: update java.security.KeyStore to jdk8u60"
am: d53ae2c285

Change-Id: I22c2ac6b7afcd590864a7a27cd68cc13c8b9da7d

commit | commitdiff | tree

Sergio Giro [Wed, 31 Aug 2016 12:24:48 +0000 (12:24 +0000)]

Merge "java.security: update java.security.KeyStore to jdk8u60"

commit | commitdiff | tree

Jakub Pawlowski [Fri, 5 Aug 2016 13:40:31 +0000 (06:40 -0700)]

Separate advertiser from GATT client (1/4)

Bug: 30622771
Change-Id: I08c0498f8a1ea04423d3e864e9a60c7c78f1dbad

commit | commitdiff | tree

Neil Fuller [Wed, 31 Aug 2016 10:32:17 +0000 (11:32 +0100)]

Fix receive timeout on LocalSocket

The receive timeout stopped being set incorrect due to commit
c80af6d8. There is an associated CTS regression test in cts/.

Test: Ran CTS test android.net.cts.LocalSocketTest
Bug: 31205169
Change-Id: I99808478946f8eae502c49d2cb83465648b9c904

commit | commitdiff | tree

Sergio Giro [Wed, 31 Aug 2016 08:37:24 +0000 (08:37 +0000)]

Merge "java.security.cert: update classes in java.security.cert (part 2)" am: 9484bff017 am: 47f7d8384b
am: 0ac5c50850

Change-Id: Iebb89cfa34482e3af937a6e15c97b146e875ebef

commit | commitdiff | tree

Sergio Giro [Wed, 31 Aug 2016 08:31:17 +0000 (08:31 +0000)]

Merge "java.security.cert: update classes in java.security.cert (part 2)" am: 9484bff017
am: 47f7d8384b

Change-Id: Ib1384141da63cae9341335b79dc585267073c4bb

commit | commitdiff | tree

Sergio Giro [Wed, 31 Aug 2016 08:26:25 +0000 (08:26 +0000)]

Merge "java.security.cert: update classes in java.security.cert (part 2)"
am: 9484bff017

Change-Id: Idb12e10674a34ebfd3cf0236cc8cbde1979e5cb7

commit | commitdiff | tree

Sergio Giro [Wed, 31 Aug 2016 08:18:57 +0000 (08:18 +0000)]

Merge "java.security.cert: update classes in java.security.cert (part 2)"

commit | commitdiff | tree

smain@google.com [Wed, 31 Aug 2016 03:54:35 +0000 (03:54 +0000)]

replace the N Preview landing page with the redirect to the package index also update version metadata (no longer preview, now 7.0) am: dde8deb950 am: c9ec419c9c
am: 6727dce8f5

Change-Id: I66b2cf3445db371c5e30796538405de369eef21e

commit | commitdiff | tree

smain@google.com [Wed, 31 Aug 2016 03:48:28 +0000 (03:48 +0000)]

replace the N Preview landing page with the redirect to the package index also update version metadata (no longer preview, now 7.0) am: dde8deb950
am: c9ec419c9c

Change-Id: If44d4e5bfb6141b0ea7e4a6c8b1a4cad5aa95547

commit | commitdiff | tree

smain@google.com [Wed, 31 Aug 2016 03:40:37 +0000 (03:40 +0000)]

replace the N Preview landing page with the redirect to the package index also update version metadata (no longer preview, now 7.0)
am: dde8deb950

Change-Id: Ide293756b6b7a75a434ff9ed3cf15cd40fbd3452

commit | commitdiff | tree

Felipe Leme [Wed, 31 Aug 2016 03:39:58 +0000 (03:39 +0000)]

Merge "Adds a section for unaccounted data." into nyc-mr1-dev am: 63ee361d4e
am: f89827b1d9

Change-Id: I4ed7f8e9f3b487f2f7b64a71a23af61b88689ed0

commit | commitdiff | tree

Felipe Leme [Wed, 31 Aug 2016 03:21:51 +0000 (03:21 +0000)]

Adds a section for unaccounted data. am: 54dc9edc52
am: e2e58543a0

Change-Id: I8b72d482eb3d635a9feb5282865640c4653dd653

commit | commitdiff | tree

Felipe Leme [Wed, 31 Aug 2016 03:10:56 +0000 (03:10 +0000)]

Merge "Adds a section for unaccounted data." into nyc-mr1-dev
am: 63ee361d4e

Change-Id: I428b4b6340022e4ffd8e2279f80408ad4fecc658

commit | commitdiff | tree

Felipe Leme [Wed, 31 Aug 2016 03:10:50 +0000 (03:10 +0000)]

Adds a section for unaccounted data.
am: 54dc9edc52

Change-Id: Ib4b8dca251618e239634716e633693474d922e96

commit | commitdiff | tree

TreeHugger Robot [Wed, 31 Aug 2016 03:04:44 +0000 (03:04 +0000)]

Merge "Adds a section for unaccounted data." into nyc-mr1-dev

commit | commitdiff | tree

Mike Tsao [Wed, 31 Aug 2016 01:46:30 +0000 (01:46 +0000)]

Merge "Fix QS CTS failure caused by tile backup" into nyc-dr1-dev am: 59b5c1030c am: d4925d59cf
am: c090c26ed1

Change-Id: Ib857b2a26c63914c61040deb076aba4234712d13

commit | commitdiff | tree

Jason Monk [Wed, 31 Aug 2016 01:46:25 +0000 (01:46 +0000)]

Fix QS CTS failure caused by tile backup am: 34f6cbc288 am: 89fb99c8e9
am: 0318c9a681

Change-Id: If715e04a98d64fe4fd78c935224b5bb3bc631493

commit | commitdiff | tree

Mike Tsao [Wed, 31 Aug 2016 01:40:51 +0000 (01:40 +0000)]

Merge "Fix QS CTS failure caused by tile backup" into nyc-dr1-dev am: 59b5c1030c
am: d4925d59cf

Change-Id: Iac2fe1713c79f5cd1002b5cf47b39f140c9d25fd

commit | commitdiff | tree

Jason Monk [Wed, 31 Aug 2016 01:40:49 +0000 (01:40 +0000)]

Fix QS CTS failure caused by tile backup am: 34f6cbc288
am: 89fb99c8e9

Change-Id: I34e6ed3e9641e67dde208a43b063192c8c92e8c8

commit | commitdiff | tree

Mike Tsao [Wed, 31 Aug 2016 01:36:57 +0000 (01:36 +0000)]

Merge "Fix QS CTS failure caused by tile backup" into nyc-dr1-dev
am: 59b5c1030c

Change-Id: I515842522195d9b57a89532615157343d462cf78

commit | commitdiff | tree

Jason Monk [Wed, 31 Aug 2016 01:36:54 +0000 (01:36 +0000)]

Fix QS CTS failure caused by tile backup
am: 34f6cbc288

Change-Id: Ic82ccc386b8ab81797e748893b831601c34c12ce

commit | commitdiff | tree

Mike Tsao [Wed, 31 Aug 2016 01:30:01 +0000 (01:30 +0000)]

Merge "Fix QS CTS failure caused by tile backup" into nyc-dr1-dev

commit | commitdiff | tree

Svetoslav Ganov [Wed, 31 Aug 2016 01:04:10 +0000 (01:04 +0000)]

Merge "Properly close fd backing a MemoryIntArray" into nyc-mr1-dev am: 43896cbc02
am: eaf5301f5e

Change-Id: I956f6584dd04b00d4649f79fbd73f1e690c2a178

commit | commitdiff | tree

Svetoslav Ganov [Wed, 31 Aug 2016 01:04:00 +0000 (01:04 +0000)]

Properly close fd backing a MemoryIntArray am: fe2462f3a6
am: b7be22cdaf

Change-Id: Ie598d2310fff4d72f618ecfa9e2efae78c595a10

commit | commitdiff | tree

Svetoslav Ganov [Wed, 31 Aug 2016 00:56:34 +0000 (00:56 +0000)]

Merge "Properly close fd backing a MemoryIntArray" into nyc-mr1-dev
am: 43896cbc02

Change-Id: I1784f633a67907ade8b15738676163c7a6d03d31

commit | commitdiff | tree

Svetoslav Ganov [Wed, 31 Aug 2016 00:56:32 +0000 (00:56 +0000)]

Properly close fd backing a MemoryIntArray
am: fe2462f3a6

Change-Id: Iaf35af209d210ba0aa6239bdeb0c81a079d25543

commit | commitdiff | tree

TreeHugger Robot [Wed, 31 Aug 2016 00:49:40 +0000 (00:49 +0000)]

Merge "Properly close fd backing a MemoryIntArray" into nyc-mr1-dev

commit | commitdiff | tree

sergeyv [Wed, 31 Aug 2016 00:37:55 +0000 (00:37 +0000)]

Merge "TextureView: clean up displaylists" into nyc-mr1-dev am: c0e2e0ad62
am: b6ef43e3df

Change-Id: I4693beb2a51eb78f04aa559ae5ae2115ee3f1108

commit | commitdiff | tree

sergeyv [Wed, 31 Aug 2016 00:37:51 +0000 (00:37 +0000)]

TextureView: clean up displaylists am: 17dd01b693
am: ac2ca87e92

Change-Id: I69adecc118bed63acf46f6a1a64c9cc7e376edaa

commit | commitdiff | tree

sergeyv [Wed, 31 Aug 2016 00:32:19 +0000 (00:32 +0000)]

Merge "TextureView: clean up displaylists" into nyc-mr1-dev
am: c0e2e0ad62

Change-Id: I28af841931189142973dc0b2150d8e2a101de4a9

commit | commitdiff | tree

sergeyv [Wed, 31 Aug 2016 00:32:17 +0000 (00:32 +0000)]

TextureView: clean up displaylists
am: 17dd01b693

Change-Id: Ib32a64f032b9f7230414f038417b2151f1e6e4be

commit | commitdiff | tree

TreeHugger Robot [Wed, 31 Aug 2016 00:26:43 +0000 (00:26 +0000)]

Merge "TextureView: clean up displaylists" into nyc-mr1-dev

commit | commitdiff | tree

Jorim Jaggi [Wed, 31 Aug 2016 00:23:59 +0000 (00:23 +0000)]

Merge "Fix bug that apps are not unminimizing if recent tasks are empty" into nyc-mr1-dev am: c8cccdcbd3
am: f82699af88

Change-Id: Id69972588d9e472ec6c05a54c4c36173241685f3

commit | commitdiff | tree

Jorim Jaggi [Wed, 31 Aug 2016 00:23:55 +0000 (00:23 +0000)]

Fix bug that apps are not unminimizing if recent tasks are empty am: 936aaeb878
am: c037bb26cb

Change-Id: I205ee84bc78f6a8f0ae5aa7b361dbb3964202766

commit | commitdiff | tree

Jorim Jaggi [Wed, 31 Aug 2016 00:17:52 +0000 (00:17 +0000)]

Merge "Fix bug that apps are not unminimizing if recent tasks are empty" into nyc-mr1-dev
am: c8cccdcbd3

Change-Id: I166ac901bf5dba2742003f97c601a1261bcc6316

commit | commitdiff | tree

Jorim Jaggi [Wed, 31 Aug 2016 00:17:49 +0000 (00:17 +0000)]

Fix bug that apps are not unminimizing if recent tasks are empty
am: 936aaeb878

Change-Id: I30d83528945b04fbb39ebf1ec4b98841a551930a

commit | commitdiff | tree

TreeHugger Robot [Wed, 31 Aug 2016 00:08:43 +0000 (00:08 +0000)]

Merge "Fix bug that apps are not unminimizing if recent tasks are empty" into nyc-mr1-dev

commit | commitdiff | tree

Adam Seaton [Tue, 30 Aug 2016 23:52:17 +0000 (23:52 +0000)]

Revert "Bump up the uncrypt timeout to 30 min." Creates Null Build to test OTA failure fix. This reverts commit 8abcfed8a42a1ca517ee3c8d0448fda669ff9ded. am: b57e6560d0 am: e245037327 am: 1ceb0fcf3a am: cb3c7d3b0e
am: c37d7a4756

Change-Id: Ia2b693f155e1d116f40e1a011abe3bdc70e8902c

commit | commitdiff | tree

Adam Seaton [Tue, 30 Aug 2016 23:46:45 +0000 (23:46 +0000)]

Revert "Bump up the uncrypt timeout to 30 min." Creates Null Build to test OTA failure fix. This reverts commit 8abcfed8a42a1ca517ee3c8d0448fda669ff9ded. am: b57e6560d0 am: e245037327 am: 1ceb0fcf3a
am: cb3c7d3b0e

Change-Id: I009991aae750226f9596af2969428de85c6e4412

commit | commitdiff | tree

Adam Seaton [Tue, 30 Aug 2016 23:46:01 +0000 (23:46 +0000)]

Revert "Bump up the uncrypt timeout to 30 min." Creates Null Build to test OTA failure fix. This reverts commit 8abcfed8a42a1ca517ee3c8d0448fda669ff9ded. am: b57e6560d0 am: e245037327
am: f11acea915

Change-Id: I3cb97b4e58b04cc916e3c959b7b829881a0417c0

commit | commitdiff | tree

Adam Seaton [Tue, 30 Aug 2016 23:40:29 +0000 (23:40 +0000)]

Revert "Bump up the uncrypt timeout to 30 min." Creates Null Build to test OTA failure fix. This reverts commit 8abcfed8a42a1ca517ee3c8d0448fda669ff9ded. am: b57e6560d0 am: e245037327
am: 1ceb0fcf3a

Change-Id: I2d5d6f564142878b13eed937289d0890a66ec065

commit | commitdiff | tree

Adam Seaton [Tue, 30 Aug 2016 23:39:04 +0000 (23:39 +0000)]

Revert "Bump up the uncrypt timeout to 30 min." Creates Null Build to test OTA failure fix. This reverts commit 8abcfed8a42a1ca517ee3c8d0448fda669ff9ded. am: b57e6560d0
am: e245037327

Change-Id: Ib46ce4c0e12a313f3b376634a85ae1050d655c34

commit | commitdiff | tree

Jason Monk [Tue, 30 Aug 2016 23:34:33 +0000 (23:34 +0000)]

Merge "Backup system QS tiles DO NOT MERGE" into nyc-dev am: a845535045
am: f06c51a3ea

Change-Id: If9d27b0ad67bc06f4d5a713c8cb24482b14c576f

commit | commitdiff | tree

Jason Monk [Tue, 30 Aug 2016 23:34:28 +0000 (23:34 +0000)]

Backup system QS tiles DO NOT MERGE am: 37bd2be160
am: 297d238130

Change-Id: Ic2ff4baf20fbc5d7ccca3d0cfdec144c33e1987e

commit | commitdiff | tree

Jason Monk [Tue, 30 Aug 2016 23:29:50 +0000 (23:29 +0000)]

Merge "Backup system QS tiles DO NOT MERGE" into nyc-dev am: a845535045 am: 697551f1cc am: 65370c7509
am: e14c73cc17

Change-Id: Ia9285840ee1bde128594f8f342ff2f4e2c60c904

commit | commitdiff | tree

Jason Monk [Tue, 30 Aug 2016 23:29:45 +0000 (23:29 +0000)]

Backup system QS tiles DO NOT MERGE am: 37bd2be160 -s ours am: f6a168f728 am: 261c64af9a
am: 5619f0d6fc

Change-Id: I060b63cdef52556c40be57a6e0fa1c1ffbb2e23b

commit | commitdiff | tree

Adam Seaton [Tue, 30 Aug 2016 23:28:44 +0000 (23:28 +0000)]

Revert "Bump up the uncrypt timeout to 30 min." Creates Null Build to test OTA failure fix. This reverts commit 8abcfed8a42a1ca517ee3c8d0448fda669ff9ded. am: b57e6560d0
am: e245037327

Change-Id: I477f3e1c5e685df2ef2a335790ab49aac6c13eef

commit | commitdiff | tree

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

Merge "Revert "Fix flicker while booting"" into nyc-mr1-dev am: 94b976a8c2
am: edb092c6f7

Change-Id: I1af403e9b652e1124e23087bd465e2c7a6c54b0a

commit | commitdiff | tree

Jason Monk [Tue, 30 Aug 2016 23:21:12 +0000 (23:21 +0000)]

Merge "Backup system QS tiles DO NOT MERGE" into nyc-dev am: a845535045 am: 697551f1cc
am: 65370c7509

Change-Id: Iac9f845d9e4e3404523e530db94d98841029d6dc

commit | commitdiff | tree

Jorim Jaggi [Tue, 30 Aug 2016 23:21:10 +0000 (23:21 +0000)]

Revert "Fix flicker while booting" am: ba5339d5d6
am: 6a032cca07

Change-Id: I56e1ee20782793357dfab3eb7b1280b36829b968

commit | commitdiff | tree

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

Revert "Bump up the uncrypt timeout to 30 min." Creates Null Build to test OTA failure fix. This reverts commit 8abcfed8a42a1ca517ee3c8d0448fda669ff9ded.
am: b57e6560d0

Change-Id: Idaafcb7c835aa7b7b83bb7382900ef3d18fa551f

commit | commitdiff | tree

Jason Monk [Tue, 30 Aug 2016 23:15:23 +0000 (23:15 +0000)]

Backup system QS tiles DO NOT MERGE am: 37bd2be160 -s ours am: f6a168f728
am: 261c64af9a

Change-Id: Ia94c39cefc476117d283887ac09dce2476845ab5

commit | commitdiff | tree

Jason Monk [Tue, 30 Aug 2016 23:10:01 +0000 (23:10 +0000)]

Merge "Backup system QS tiles DO NOT MERGE" into nyc-dev am: a845535045
am: 697551f1cc

Change-Id: I1bb49c48f446658df13ee80d5a3a8890aabc78f6

commit | commitdiff | tree

Jason Monk [Tue, 30 Aug 2016 23:09:58 +0000 (23:09 +0000)]

Backup system QS tiles DO NOT MERGE am: 37bd2be160 -s ours
am: f6a168f728

Change-Id: I71f6dd48711ac364df92600bca6fc827318a5ce0

commit | commitdiff | tree

Jorim Jaggi [Tue, 30 Aug 2016 23:09:47 +0000 (23:09 +0000)]

Merge "Revert "Fix flicker while booting"" into nyc-mr1-dev
am: 94b976a8c2

Change-Id: Iec1099bfd605c89ca7e6efc8aa1b6249db40d014

commit | commitdiff | tree

Jorim Jaggi [Tue, 30 Aug 2016 23:09:43 +0000 (23:09 +0000)]

Revert "Fix flicker while booting"
am: ba5339d5d6

Change-Id: I1c3dfbe95e35db94d36d98507474690b0e70d4b2

commit | commitdiff | tree

Adrian Salido [Tue, 30 Aug 2016 23:03:20 +0000 (23:03 +0000)]

Merge "add dri device to zygote whitelisted FDs" into nyc-mr1-dev am: e849dfcc24
am: bd1be6173d

Change-Id: I25804cef15170096f6258f8ec92cdef277702b80

commit | commitdiff | tree

Jason Monk [Tue, 30 Aug 2016 23:03:16 +0000 (23:03 +0000)]

Merge "Backup system QS tiles DO NOT MERGE" into nyc-dev
am: a845535045

Change-Id: I138faa4899fac332af6f2297c898beb187fa7483

commit | commitdiff | tree

Adrian Salido [Tue, 30 Aug 2016 23:03:14 +0000 (23:03 +0000)]

add dri device to zygote whitelisted FDs am: 8977e424ee
am: 3928cf827b

Change-Id: I1e513a6cbe7ba64df96b45117f4c8619e0efe4a4

commit | commitdiff | tree

Jason Monk [Tue, 30 Aug 2016 23:03:11 +0000 (23:03 +0000)]

Backup system QS tiles DO NOT MERGE
am: 37bd2be160 -s ours

Change-Id: Iec5455c466d2c92103666f24d1eee750061bebca

commit | commitdiff | tree

Jorim Jaggi [Tue, 30 Aug 2016 22:59:14 +0000 (22:59 +0000)]

Merge "Revert "Fix flicker while booting"" into nyc-mr1-dev

commit | commitdiff | tree

Adrian Salido [Tue, 30 Aug 2016 22:56:12 +0000 (22:56 +0000)]

Merge "add dri device to zygote whitelisted FDs" into nyc-mr1-dev
am: e849dfcc24

Change-Id: I2d3eeefa4155da4fe7f891b0e8be0baa3c612ea3

commit | commitdiff | tree

Adrian Salido [Tue, 30 Aug 2016 22:56:10 +0000 (22:56 +0000)]

add dri device to zygote whitelisted FDs
am: 8977e424ee

Change-Id: I65469576d235670de964e2f9c12024afb43c90d4

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 30 Aug 2016 22:50:48 +0000 (22:50 +0000)]

Merge "Merge "Update CP2 javadoc" into nyc-mr1-dev am: 82babe050a am: 2b569adeee" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 30 Aug 2016 22:50:41 +0000 (22:50 +0000)]

Merge "Merge "Fix google-explicit-constructor warnings in soundpool." am: feee33ce2c am: 17f1fc6c76 am: c80db139b3" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jason Monk [Tue, 30 Aug 2016 22:50:14 +0000 (22:50 +0000)]

Merge "Backup system QS tiles DO NOT MERGE" into nyc-dev
am: a845535045

Change-Id: Ib38430d968e20db46abac87c4efbb045c335d193

commit | commitdiff | tree

Chih-hung Hsieh [Tue, 30 Aug 2016 22:50:14 +0000 (22:50 +0000)]

Merge "Fix google-explicit-constructor warnings in soundpool." am: feee33ce2c am: 17f1fc6c76
am: c80db139b3

Change-Id: I6a5f93e80d4ef18286fcb45987b6f9bbd7425f88

commit | commitdiff | tree

Jason Monk [Tue, 30 Aug 2016 22:50:10 +0000 (22:50 +0000)]

Backup system QS tiles DO NOT MERGE
am: 37bd2be160

Change-Id: I5d291b5ee504acf40386cbce4edaf5b20a1a3d3d

commit | commitdiff | tree

Adrian Salido [Tue, 30 Aug 2016 22:50:03 +0000 (22:50 +0000)]

Merge "add dri device to zygote whitelisted FDs" into nyc-mr1-dev

commit | commitdiff | tree

Makoto Onuki [Tue, 30 Aug 2016 22:50:01 +0000 (22:50 +0000)]

Merge "Update CP2 javadoc" into nyc-mr1-dev am: 82babe050a
am: 2b569adeee

Change-Id: I3a3eab643374ecabd5c6a191e7558ce309416984

commit | commitdiff | tree

Makoto Onuki [Tue, 30 Aug 2016 22:49:57 +0000 (22:49 +0000)]

Update CP2 javadoc am: 93d94ebac2
am: e3972019dc

Change-Id: Ia988c68813311b042c6ba9fbaa3c486935e5566b