Chih-hung Hsieh
|
25c9f6cede
|
Merge "Fix google-explicit-constructor warnings in libs/hwui." am: 7207562ff7 am: d7a69e04eb am: 842f1e48e7
am: 1f50f80aab
Change-Id: I713bd07fee150cc684e630045e02872b23062a5a
|
2016-09-01 01:26:40 +00:00 |
|
Chih-hung Hsieh
|
2378ff89f4
|
Merge "Fix google-explicit-constructor warnings in media/mca." am: 2cace65f71 am: 4836d07980 am: edd824b94a
am: d835145d2f
Change-Id: Ia15a7ea301c489653f3f95356328248b27da293a
|
2016-09-01 01:26:36 +00:00 |
|
Neil Fuller
|
4e4f9a24e0
|
Merge "Fix receive timeout on LocalSocket" am: 7a9c0cd854 am: 680ec020a1 am: ef1fb4889a
am: 0aa7d4bb3f
Change-Id: I35b4ff81c9263a3a2d3052602fe43bc37377c733
|
2016-09-01 01:18:32 +00:00 |
|
Sergio Giro
|
f3b7b13691
|
Merge "java.security.Principal: add default method Principal#implies" am: 0c8c4a5d98 am: e639bbd7d0 am: 61c0996d6f
am: 016e850921
Change-Id: I35ad05729d5575b2e790547f2bede8c849395ada
|
2016-09-01 01:18:28 +00:00 |
|
Sergio Giro
|
338193c457
|
Merge "java.security.SecretKey: now extends from Destroyable" am: c7bd0d0adc am: 8a5790a287 am: d4b193c30c
am: 22b8317a49
Change-Id: I55b5522eb98b5db4c8599202361ab9595a38d461
|
2016-09-01 01:18:23 +00:00 |
|
Sergio Giro
|
196c5b82df
|
Merge "java.security: update java.security.KeyStore to jdk8u60" am: d53ae2c285 am: 565c1fbf8b am: e04c029ed5
am: 87ececf5c8
Change-Id: I970ea89c8e278b675ef63645224e456d932b614b
|
2016-09-01 01:18:18 +00:00 |
|
Sergio Giro
|
26275abbbd
|
Merge "java.security.cert: update classes in java.security.cert (part 2)" am: 9484bff017 am: 47f7d8384b am: 0ac5c50850
am: 7790666747
Change-Id: Ia6ec15ec97fecda1a182b5b1b875fcfb8446dc5e
|
2016-09-01 01:18:13 +00:00 |
|
Android Build Merger (Role)
|
30089092dd
|
Merge "Merge "Adds a section for unaccounted data." into nyc-mr1-dev am: 63ee361d4e am: f89827b1d9 am: deaeef0bc0"
|
2016-09-01 01:12:52 +00:00 |
|
Android Build Merger (Role)
|
d7883ae88b
|
Merge "Adds a section for unaccounted data. am: 54dc9edc52 am: e2e58543a0 am: 5c09e77b77"
|
2016-09-01 01:12:39 +00:00 |
|
Android Build Merger (Role)
|
10fefe7167
|
Merge "Merge "Fix QS CTS failure caused by tile backup" into nyc-dr1-dev am: 59b5c1030c am: d4925d59cf am: c090c26ed1 am: 1757c92105"
|
2016-09-01 01:12:26 +00:00 |
|
Svetoslav Ganov
|
ac492f2c66
|
Merge "resolve merge conflicts of a2c1196 to master - continued"
|
2016-09-01 01:12:23 +00:00 |
|
Felipe Leme
|
3dbfdda725
|
Merge "Adds a section for unaccounted data." into nyc-mr1-dev am: 63ee361d4e am: f89827b1d9
am: deaeef0bc0
Change-Id: I938f127453513e1a953fb157f937d19217e244be
|
2016-09-01 01:11:23 +00:00 |
|
Felipe Leme
|
d8001097c4
|
Adds a section for unaccounted data. am: 54dc9edc52 am: e2e58543a0
am: 5c09e77b77
Change-Id: I528b8b4e8e8f7e5403fe9c1536a8fd9211d6813c
|
2016-09-01 01:11:19 +00:00 |
|
Mike Tsao
|
0b1d38235d
|
Merge "Fix QS CTS failure caused by tile backup" into nyc-dr1-dev am: 59b5c1030c am: d4925d59cf am: c090c26ed1
am: 1757c92105
Change-Id: Iaa07f7b05044a11eda31b22efc785509d997b31a
|
2016-09-01 01:11:15 +00:00 |
|
Jason Monk
|
dd61f8b505
|
Fix QS CTS failure caused by tile backup am: 34f6cbc288 am: 89fb99c8e9 am: 0318c9a681
am: 10bd4997bc
Change-Id: Ia150821cf25bdf4494a3202c7632557a9858284d
|
2016-09-01 01:11:10 +00:00 |
|
Svetoslav Ganov
|
a9ce8606e0
|
Merge "Properly close fd backing a MemoryIntArray" into nyc-mr1-dev am: 43896cbc02 am: eaf5301f5e
am: 8f3a306c32
Change-Id: I149fdcc7e697246ce36b05c10a87af20e5d077c7
|
2016-09-01 01:11:03 +00:00 |
|
Svetoslav Ganov
|
24c27754c5
|
resolve merge conflicts of a2c1196 to master - continued
Change-Id: I1b3c0e1a42b4cbb025de049e95d5377a162d58d1
|
2016-08-31 18:09:00 -07:00 |
|
Svetoslav Ganov
|
388d08b6e3
|
resolve merge conflicts of a2c1196 to master
Change-Id: I221f03e2cda9e677199698d492d16788c25c9e96
|
2016-08-31 18:02:57 -07:00 |
|
Mitchell Wills
|
0ab209c704
|
Merge changes I21fc6802,I8839c6cc
* changes:
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
Revert "DO NOT MERGE Revert "Add WiFi toggle prompts - framework""
|
2016-08-31 23:56:16 +00:00 |
|
sergeyv
|
2c0a211164
|
Merge "TextureView: clean up displaylists" into nyc-mr1-dev am: c0e2e0ad62 am: b6ef43e3df
am: 502a788007
Change-Id: Idc45ef565fd405c07f3c0174ea103c2c5cc58790
|
2016-08-31 23:50:27 +00:00 |
|
sergeyv
|
22ddb31dce
|
TextureView: clean up displaylists am: 17dd01b693 am: ac2ca87e92
am: bb37b7b613
Change-Id: I12252ddc60ad7f52fe1604ac84042a759b8373c4
|
2016-08-31 23:47:32 +00:00 |
|
Jorim Jaggi
|
1c7533072e
|
Merge "Fix bug that apps are not unminimizing if recent tasks are empty" into nyc-mr1-dev am: c8cccdcbd3 am: f82699af88
am: 1cf9ce87bf
Change-Id: Iddcf59dc8a0829869f2210ba92374e002a17fb25
|
2016-08-31 23:47:28 +00:00 |
|
Jorim Jaggi
|
5d9202885b
|
Fix bug that apps are not unminimizing if recent tasks are empty am: 936aaeb878 am: c037bb26cb
am: fbe9038d39
Change-Id: I9e67340012a828cb53a0ee64ad61fe6af2c5b904
|
2016-08-31 23:47:25 +00:00 |
|
Adam Seaton
|
502c216ea5
|
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
am: 9cb5aa97fa
Change-Id: I9563834d6f9436f6624a14590e323be32462be8a
|
2016-08-31 23:47:20 +00:00 |
|
Adam Seaton
|
2dd30c89e2
|
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
am: 8aa8342ee0
Change-Id: Id2a6f65eaffd27f99f41cdacb428b0c81b63be33
|
2016-08-31 23:47:16 +00:00 |
|
Jason Monk
|
f8e968748a
|
Merge "Backup system QS tiles DO NOT MERGE" into nyc-dev am: a845535045 am: f06c51a3ea
am: b98ca8b4cc -s ours
Change-Id: I2de35cf940a820846de895e98e3d83a65363259d
|
2016-08-31 23:40:40 +00:00 |
|
Jason Monk
|
deedd40e24
|
Backup system QS tiles DO NOT MERGE am: 37bd2be160 am: 297d238130
am: 14af5da90f -s ours
Change-Id: Icb5c2445ea6eb033a7aa0bb30348f4d14ff91611
|
2016-08-31 23:40:37 +00:00 |
|
Jason Monk
|
cf777267b1
|
Merge "Backup system QS tiles DO NOT MERGE" into nyc-dev am: a845535045 am: 697551f1cc am: 65370c7509 am: e14c73cc17
am: bed36cb1d3 -s ours
Change-Id: I4d6d6fd120840a9a6dbbdbf5f540c09443739c0f
|
2016-08-31 23:40:31 +00:00 |
|
Jason Monk
|
f2a362857f
|
Backup system QS tiles DO NOT MERGE am: 37bd2be160 -s ours am: f6a168f728 am: 261c64af9a am: 5619f0d6fc
am: 86f35fec3b -s ours
Change-Id: I09168f0a879f479507d0922f127bc414e586c9bf
|
2016-08-31 23:40:26 +00:00 |
|
Jorim Jaggi
|
03de6ed290
|
Merge "Revert "Fix flicker while booting"" into nyc-mr1-dev am: 94b976a8c2 am: edb092c6f7
am: 217cea2ab8
Change-Id: Ie179b3f3cbf00a8859bf3e5125759ff18fb81c5c
|
2016-08-31 23:40:21 +00:00 |
|
Jorim Jaggi
|
833999e0c8
|
Revert "Fix flicker while booting" am: ba5339d5d6 am: 6a032cca07
am: 2cfc4f61f9
Change-Id: I2e948345e57725dab6d64d6dabf3f5c08056207d
|
2016-08-31 23:36:02 +00:00 |
|
Adrian Salido
|
c7409f17a2
|
Merge "add dri device to zygote whitelisted FDs" into nyc-mr1-dev am: e849dfcc24 am: bd1be6173d
am: bf63fdbcef
Change-Id: I8ff439c473f6501d30dd4f80032f389521f8cc29
|
2016-08-31 23:35:58 +00:00 |
|
Adrian Salido
|
cbb3421ab9
|
add dri device to zygote whitelisted FDs am: 8977e424ee am: 3928cf827b
am: 31d281984e
Change-Id: I5a9569df73ea50c047d7f0427ff84cd4d208e4c8
|
2016-08-31 23:35:54 +00:00 |
|
Makoto Onuki
|
c689f19f7b
|
Merge "Merge "Update CP2 javadoc" into nyc-mr1-dev am: 82babe050a am: 2b569adeee" into nyc-mr1-dev-plus-aosp
am: c3707d85ac
Change-Id: Ib428d13a4991700dabca85ad1aeefd21f05a3f19
|
2016-08-31 23:35:50 +00:00 |
|
Makoto Onuki
|
97c7e00cfb
|
Merge "Update CP2 javadoc" into nyc-mr1-dev am: 82babe050a am: 2b569adeee
am: 828c24b54f
Change-Id: I951301574e3d0bbf9e36a60e7d702bde3f252cc0
|
2016-08-31 23:35:47 +00:00 |
|
Chih-hung Hsieh
|
1fec4b5c56
|
Merge "Merge "Fix google-explicit-constructor warnings in soundpool." am: feee33ce2c am: 17f1fc6c76 am: c80db139b3" into nyc-mr1-dev-plus-aosp
am: b63749b00e
Change-Id: I4a794cc9efb8da4a82c6b39c626266462277b94e
|
2016-08-31 23:35:39 +00:00 |
|
Chih-hung Hsieh
|
20651bc467
|
Merge "Fix google-explicit-constructor warnings in soundpool." am: feee33ce2c am: 17f1fc6c76 am: c80db139b3
am: cb98cac6d3
Change-Id: Id22ce0c86caa79f2eabf4201f6a0267d13270a00
|
2016-08-31 23:35:35 +00:00 |
|
Makoto Onuki
|
034de15cb6
|
Update CP2 javadoc am: 93d94ebac2 am: e3972019dc
am: e08b704cb7
Change-Id: Ie9e3aea4157d848044254a779b2d3a3df0f8152d
|
2016-08-31 23:32:38 +00:00 |
|
Chih-Hung Hsieh
|
900b2ab6d7
|
Merge "Fix google-explicit-constructor warnings in core/jni." am: cfc9f5d03d am: ed4b31f9e1 am: 276322ad2e
am: 7af6508766
Change-Id: Iacc44f2bf7dfea03b3d023bb9b58bbb296ebbcfe
|
2016-08-31 23:32:34 +00:00 |
|
Pankaj Kanwar
|
0191e89c92
|
Merge changes Iccb6d089,I9c50a59f into nyc-dr1-dev am: aa8263d85d am: a32e7e9089 am: f56bf7eae3
am: 953971316c
Change-Id: I478e0dfd3a4c26310d143c16e7a3b93c9195453e
|
2016-08-31 23:32:30 +00:00 |
|
Lorenzo Colitti
|
e22143e855
|
Network switch notifications: rate & daily limits am: 84e6f1232c am: 858499b2c0 am: 2c535a4f7c
am: 98ed392cf7
Change-Id: I0c067ec355eb2a50af3c828b1fe3ee8a78e44536
|
2016-08-31 23:31:56 +00:00 |
|
Hugo Benichi
|
3c947bbba9
|
Network Switching Notifications: add unit tests am: a43a095106 am: 56f1281888 am: cf5f5785c9
am: 216bd99039
Change-Id: Idf4986df6f0f2b232aeaa5e43feb51615089dc71
|
2016-08-31 23:30:34 +00:00 |
|
Mitchell Wills
|
b38028128b
|
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
This reverts commit 6a80a4b05acacd3fd07583a3bb6185e9770215eb.
Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
|
2016-08-31 16:15:37 -07:00 |
|
Makoto Onuki
|
52129da478
|
Merge "Backport shortcut manager test utilities to DR" into nyc-dr1-dev am: 9480c98ddf am: e58471e7e8 am: 7121484984
am: 91bfa8f721
Change-Id: I5b40ddb8bcd3b393d237c663151f8fafac4d7a83
|
2016-08-31 23:15:11 +00:00 |
|
Makoto Onuki
|
fad0de646b
|
Backport shortcut manager test utilities to DR am: 0a15cd4ba0 am: fda26f6ffb am: 54541310a5
am: 136f952b55
Change-Id: I5bb2efdbfec4addc88baaea754e49a50b35d7c61
|
2016-08-31 23:14:10 +00:00 |
|
Makoto Onuki
|
cf05b8c6f2
|
Merge "Shortcut: Improve backup & restore" into nyc-mr1-dev am: dec5726c43 am: a4e4ab809d
am: cb1686d2d8
Change-Id: Idaedd814c975fa53b5718658139ba8ac5e7a820f
|
2016-08-31 23:11:21 +00:00 |
|
Makoto Onuki
|
b118e414cd
|
Shortcut: Improve backup & restore am: fc4cf2da34 am: 27b36f4789
am: cecc0916a1
Change-Id: Ib4af06a42b6d940f422c749aeb706cafa828b49a
|
2016-08-31 23:11:17 +00:00 |
|
Mark Goldstein
|
f4361e361d
|
Merge "docs: Fix broken camera example" into nyc-dev am: 36f4638fe7 am: 92028aeb79 am: 393bd2e87a am: d4ed3c0d51
am: 79b5044cdb
Change-Id: Ic78945ba06ad3a0f8a29b6572248e08c96d76c34
|
2016-08-31 23:11:13 +00:00 |
|
Mark Goldstein
|
af4521a746
|
docs: Fix broken camera example am: 3f97bc25d4 am: 3dbf596090 am: 18b1be0deb am: ec518d6f0e
am: 4714ff2ea9
Change-Id: I69e7ba33c0286eb3d7a895d7811e061d166351cd
|
2016-08-31 23:11:10 +00:00 |
|
Mark Goldstein
|
562ef45e57
|
Merge "docs: Fix broken camera example" into nyc-dev am: 36f4638fe7 am: b213e0cedb
am: 84d53cdb02
Change-Id: I2949371020551999788517cd109ba5ad14efa514
|
2016-08-31 23:11:06 +00:00 |
|