Commit Graph

280998 Commits

Author SHA1 Message Date
Daichi Hirono
5f467daedb Set Root.FLAG_LOCAL_ONLY for MTP roots. am: b7573e93cd am: d590e3354d
am: e88dbc9dc8

Change-Id: I65587f64e0a6dbf169aade862945a6b063da82ee
2016-08-23 18:16:23 +00:00
Yang Ni
24601c87e7 Updated user document for Single-Source RenderScript am: c069ed7f8c am: 044cd35a46 am: 92b787bbf7 am: 606dcbd897
am: 333fdc8d00

Change-Id: I9aea0924198a896abf6592f4fca22fb197276ba5
2016-08-23 18:16:19 +00:00
Todd Kennedy
c6d6975ea0 Merge "No need to check package name" into nyc-mr1-dev am: 40db730b7f am: 875a96f5ac
am: 13b4a5cee2

Change-Id: Ie6a792f35baa6849ffb61ab3edb6e32fa3adbe5c
2016-08-23 18:16:14 +00:00
Todd Kennedy
d64d0f9e83 No need to check package name am: afb5269ad6 am: b9de7e33a3
am: 8860c34b32

Change-Id: If42958ce2661e7516a245954daa6da4a6897c2a2
2016-08-23 18:16:08 +00:00
Android Build Merger (Role)
59e43d34e0 Merge changes from topic 'am-5c9b25aee118431ba7acdce08fecd280'
* changes:
  Merge "Added getDataPreloadsMediaDirectory" into nyc-dr1-dev am: 0a376f5619 am: 6af20d1c4e am: a6742e1c7a am: f2ea177f85
  Added getDataPreloadsMediaDirectory am: 19551a8d8d am: c98c7e9da1 am: ca1a630ccf am: bcc3c019d3
2016-08-23 18:12:05 +00:00
Android Build Merger (Role)
6b6fe62c9b Merge changes from topic 'am-35af4edd646f40bab24ce58ec4876f71'
* changes:
  Merge changes from topic 'am-c5d69672042b41758555eb3db8f077fe' into nyc-mr1-dev am: f6f4f1ac61 am: 6afa73312c am: 6b0a08359d
  Merge "Change retail mode wallpaper (1/2)" into nyc-dr1-dev am: c7136b3b3c am: 9b2c0bf87e am: 5a08c35738 am: 312eb78b4c
  Change retail mode wallpaper (1/2) am: 6c902d0453 am: 9d0879c6ac am: 3d19454ec9 am: e4af99d6b7
2016-08-23 18:11:28 +00:00
Android Build Merger (Role)
e987a07530 Merge "Merge "Merge "Only dispatch window visibility aggregation for targetSdk >= N" into nyc-dr1-dev am: 081e393103" into nyc-mr1-dev am: b352d0a45a am: 2c9cfdf968 am: fcd4e8a4aa" 2016-08-23 18:10:54 +00:00
Fyodor Kupolov
8274dbec51 Merge "Added getDataPreloadsMediaDirectory" into nyc-dr1-dev am: 0a376f5619 am: 6af20d1c4e am: a6742e1c7a
am: f2ea177f85

Change-Id: I4dc64dc42ba3fc351989d128c1288d900448cb4b
2016-08-23 18:08:44 +00:00
Fyodor Kupolov
1dfcc09161 Added getDataPreloadsMediaDirectory am: 19551a8d8d am: c98c7e9da1 am: ca1a630ccf
am: bcc3c019d3

Change-Id: I2fc16cccb580cbd3441cddae2ab1db0c49d05336
2016-08-23 18:08:03 +00:00
Jorim Jaggi
5cc93fd91b Merge changes from topic 'am-c5d69672042b41758555eb3db8f077fe' into nyc-mr1-dev am: f6f4f1ac61 am: 6afa73312c
am: 6b0a08359d

Change-Id: I2a71b7824a864c86acc083898cc6f575e43ca8c3
2016-08-23 18:07:36 +00:00
Jorim Jaggi
3ceb4c6140 Merge "Change retail mode wallpaper (1/2)" into nyc-dr1-dev am: c7136b3b3c am: 9b2c0bf87e am: 5a08c35738
am: 312eb78b4c

Change-Id: Ib15f99095cf125023302b65a820bf92ddb9f0ace
2016-08-23 18:05:35 +00:00
Jorim Jaggi
6ace777436 Change retail mode wallpaper (1/2) am: 6c902d0453 am: 9d0879c6ac am: 3d19454ec9
am: e4af99d6b7

Change-Id: Ia74d06c44aa2b6d8bd75fa3db4fa5f5772c218d3
2016-08-23 18:04:57 +00:00
Adam Powell
cc7ec070a4 Merge "Merge "Only dispatch window visibility aggregation for targetSdk >= N" into nyc-dr1-dev am: 081e393103" into nyc-mr1-dev am: b352d0a45a am: 2c9cfdf968
am: fcd4e8a4aa

Change-Id: I42407de0daaf668e39fa009d3d0951761d87edb1
2016-08-23 18:04:52 +00:00
Android Build Merger (Role)
bb4fc83ff0 Merge "Merge "Only dispatch window visibility aggregation for targetSdk >= N" into nyc-dr1-dev am: 081e393103 am: 1b192da3fe am: abcc76610f am: 2fd24a8877" 2016-08-23 18:03:40 +00:00
Android Build Merger (Role)
9dc1aefeb5 Merge "Merge "Only dispatch window visibility aggregation for targetSdk >= N am: 64e1ba4398" into nyc-mr1-dev am: 998ff1c7be am: 79cb1d7a49 am: fb7134f9e9" 2016-08-23 18:03:17 +00:00
Android Build Merger (Role)
4225742d07 Merge "Only dispatch window visibility aggregation for targetSdk >= N am: 64e1ba4398 am: 02abbe8d4c am: ca3a267478 am: 7cc5539a03" 2016-08-23 18:02:55 +00:00
Android Build Merger (Role)
51818d0df8 Merge "Merge "Doc change: intl page updates for final n release. am: e816f1f542 am: 79d9e9df2e" into nyc-mr1-dev am: f14ba4c10f am: 67442d4c7a am: 0a4556cea1" 2016-08-23 18:02:34 +00:00
Android Build Merger (Role)
9347b3f994 Merge "Doc change: intl page updates for final n release. am: e816f1f542 am: 79d9e9df2e am: 4a273d8bb9 am: 4639359ddc am: f7c2aff90c" 2016-08-23 18:02:14 +00:00
Adam Powell
3e6c540602 Merge "Only dispatch window visibility aggregation for targetSdk >= N" into nyc-dr1-dev am: 081e393103 am: 1b192da3fe am: abcc76610f
am: 2fd24a8877

Change-Id: Ifcfcb96b1db3cc2c30c0d7294f9247b6ddb7002c
2016-08-23 18:00:41 +00:00
Adam Powell
420718be3b Merge "Only dispatch window visibility aggregation for targetSdk >= N am: 64e1ba4398" into nyc-mr1-dev am: 998ff1c7be am: 79cb1d7a49
am: fb7134f9e9

Change-Id: I210b8dd56afc858081761e22994fa653fecd016b
2016-08-23 18:00:38 +00:00
Adam Powell
10b133cc9e Only dispatch window visibility aggregation for targetSdk >= N am: 64e1ba4398 am: 02abbe8d4c am: ca3a267478
am: 7cc5539a03

Change-Id: I241adaa27bb952d2b826721100944d569ac57149
2016-08-23 18:00:35 +00:00
Dirk Dougherty
0ecd51af40 Merge "Doc change: intl page updates for final n release. am: e816f1f542 am: 79d9e9df2e" into nyc-mr1-dev am: f14ba4c10f am: 67442d4c7a
am: 0a4556cea1

Change-Id: If0390bb3325a5915a525328c74dba424cacbd5df
2016-08-23 18:00:31 +00:00
Dirk Dougherty
2dcd3a461e Doc change: intl page updates for final n release. am: e816f1f542 am: 79d9e9df2e am: 4a273d8bb9 am: 4639359ddc
am: f7c2aff90c

Change-Id: Ie2e032cc93f10d6766df5907f019ead72a9c04a8
2016-08-23 18:00:28 +00:00
Android Build Merger (Role)
aa2147394f Merge "Merge "Merge "Fix wallpaper backup eligibility test" into nyc-dr1-dev am: 56ce19099d" into nyc-mr1-dev am: 2733c16556 am: 9927f7f08b am: 142a8bb2e5" 2016-08-23 17:58:53 +00:00
Android Build Merger (Role)
2fd336d2e8 Merge "Merge "Fix wallpaper backup eligibility test" into nyc-dr1-dev am: 56ce19099d am: ad3f9a03ea am: f4b8d26f9d am: a576aac5f1" 2016-08-23 17:58:33 +00:00
Android Build Merger (Role)
9a4893b07b Merge "Merge "Fix wallpaper backup eligibility test am: f7d1b5de6e" into nyc-mr1-dev am: e022290806 am: c899f55156 am: 9d34ae160d" 2016-08-23 17:58:16 +00:00
Android Build Merger (Role)
fe3eedb144 Merge "Fix wallpaper backup eligibility test am: f7d1b5de6e am: 100b610066 am: 6939bf0b05 am: 47b146517f" 2016-08-23 17:57:56 +00:00
Sudheer Shanka
b05dbd7c61 Merge "Add usermanager related perf tests - part1" 2016-08-23 17:57:39 +00:00
Android Build Merger (Role)
1af69d594d Merge "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 am: dcb9ec90b3 -s ours" 2016-08-23 17:57:34 +00:00
Chris Tate
d12512dc9e Merge "Merge "Fix wallpaper backup eligibility test" into nyc-dr1-dev am: 56ce19099d" into nyc-mr1-dev am: 2733c16556 am: 9927f7f08b
am: 142a8bb2e5

Change-Id: Ib4960fcb539c19265108e8c0f8922f13962711ab
2016-08-23 17:56:29 +00:00
Chris Tate
2edadcf0fa Merge "Fix wallpaper backup eligibility test" into nyc-dr1-dev am: 56ce19099d am: ad3f9a03ea am: f4b8d26f9d
am: a576aac5f1

Change-Id: Ie84811891e1a38df16b7914b442c6f47c6909f64
2016-08-23 17:56:26 +00:00
Christopher Tate
a981fe5e42 Merge "Fix wallpaper backup eligibility test am: f7d1b5de6e" into nyc-mr1-dev am: e022290806 am: c899f55156
am: 9d34ae160d

Change-Id: Ief20f7e5e0042e551a9c9ae605abe0c6fce46e6a
2016-08-23 17:56:22 +00:00
Christopher Tate
d57bcbb6c7 Fix wallpaper backup eligibility test am: f7d1b5de6e am: 100b610066 am: 6939bf0b05
am: 47b146517f

Change-Id: I66425f3f057434c2fbd47ca076c5bba53ad80179
2016-08-23 17:56:19 +00:00
Adam Seaton
d663cc1950 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
am: dcb9ec90b3  -s ours

Change-Id: I881b5ccbd1fa082647158bbea4f5dea510d18a8a
2016-08-23 17:56:15 +00:00
Android Build Merger (Role)
92a1bfa8a9 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 am: 6b5a4bf98b -s ours am: bbbd17c67d -s ours am: a45a9f277b -s ours" 2016-08-23 17:54:33 +00:00
Android Build Merger (Role)
a0d854281f Merge "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 am: d25506f0c0 -s ours" 2016-08-23 17:54:16 +00:00
Android Build Merger (Role)
c16a737744 Merge "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 am: eaaa603f1f -s ours" 2016-08-23 17:53:57 +00:00
Android Build Merger (Role)
5f78a27f57 Merge "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 am: 5764a86478" 2016-08-23 17:53:39 +00:00
Android Build Merger (Role)
986f823928 Merge "Merge "If Vodafone Italy sim is in Spain consider it as roaming on Spain nw." into nyc-mr1-dev am: 4a6f3bb921 am: 078c557688 am: 1eb0f209ae" 2016-08-23 17:53:22 +00:00
Adam Seaton
d9a0616e61 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
am: a45a9f277b  -s ours

Change-Id: I3dc22c2bae10c0a6d85c133e604b064a0f665cb5
2016-08-23 17:52:10 +00:00
Tim Murray
b74e0c9f40 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
am: d25506f0c0  -s ours

Change-Id: I65cb9365c09fde364c4c4fd1c87f2517c1ce1950
2016-08-23 17:52:07 +00:00
Tim Murray
29adf3d5d7 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
am: eaaa603f1f  -s ours

Change-Id: Ie44e4b641c3c5dcde5a8ddc681c4ff0f7c873209
2016-08-23 17:52:04 +00:00
Sanket Padawe
44506eb8d4 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
am: 5764a86478

Change-Id: Iefd70c6a15e54d48579784ae8d96a474d9a2b196
2016-08-23 17:52:02 +00:00
Sanket Padawe
38d9214a6c Merge "If Vodafone Italy sim is in Spain consider it as roaming on Spain nw." into nyc-mr1-dev am: 4a6f3bb921 am: 078c557688
am: 1eb0f209ae

Change-Id: Id784e4115926ce84002d215428f544281e80c886
2016-08-23 17:51:59 +00:00
Android Build Merger (Role)
82a43b0995 Merge "Merge "If Vodafone Italy sim is in Spain consider it as roaming on Spain nw. am: 0cc68dbf29" into cw-f-dev am: eaef72bda5 am: 1afafa55fd" 2016-08-23 17:49:55 +00:00
Android Build Merger (Role)
6fa2679753 Merge "If Vodafone Italy sim is in Spain consider it as roaming on Spain nw. am: 0cc68dbf29 am: e8a2c5c331 am: 7f0fcc78bb" 2016-08-23 17:49:36 +00:00
Android Build Merger (Role)
50a6593f7c Merge "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 am: 5518e90b42 -s ours" 2016-08-23 17:49:14 +00:00
Android Build Merger (Role)
943142fef6 Merge "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 am: d1fbba1f43 -s ours" 2016-08-23 17:48:54 +00:00
Android Build Merger (Role)
9fa4ceb0f4 Merge "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 am: bf7eba3f7d -s ours" 2016-08-23 17:48:34 +00:00
Sanket Padawe
ac617a4e4c Merge "If Vodafone Italy sim is in Spain consider it as roaming on Spain nw. am: 0cc68dbf29" into cw-f-dev am: eaef72bda5
am: 1afafa55fd

Change-Id: I56151cd716652cb4783aad358ff8c891a5894607
2016-08-23 17:47:35 +00:00