OSDN Git Service
Andrew Solovay [Thu, 28 Jul 2016 01:59:23 +0000 (01:59 +0000)]
Merge \\\\"docs: Removed reference to Android Support Library\\\\" into nyc-docs am:
2a550cfa2a am:
6a56b0579d am:
8fb893e96c
am:
8f6e247913
Change-Id: I5828cd0154c435a61217db3df0ce649ed30ddfcb
Andrew Solovay [Thu, 28 Jul 2016 01:59:19 +0000 (01:59 +0000)]
Merge \\\"docs: Moving localized versions of N Preview docs\\\" into nyc-dev am:
a15c0c2902 am:
c9b1903d84
am:
e13ba26571
Change-Id: Ie103a82b56d4f6454fc37a213aa020462caf3118
Andrew Solovay [Thu, 28 Jul 2016 01:59:15 +0000 (01:59 +0000)]
docs: Moving localized versions of N Preview docs am:
32845b1eb9 am:
7b0845fea6
am:
9371b0d8eb
Change-Id: I1cec91b4bb5a42736ae770002db807204282804c
Andrew Solovay [Thu, 28 Jul 2016 01:50:37 +0000 (01:50 +0000)]
Merge \\\"resolve merge conflicts of
07fe016 to nyc-dev\\\" into nyc-dev am:
ed49ee64f0 am:
52d5b382ee
am:
f0ca1c16d7
Change-Id: Icdb6734c7f809c48db3848320b76d3471377c66c
Andrew Solovay [Thu, 28 Jul 2016 01:50:33 +0000 (01:50 +0000)]
resolve merge conflicts of
07fe016 to nyc-dev am:
0f9a790e0f am:
19747cb135
am:
c03ee73ec2
Change-Id: Ife1195c5dba328b5bf31876364aa75008e5fcb31
Daniel Yu [Thu, 28 Jul 2016 01:50:30 +0000 (01:50 +0000)]
Merge \\\"docs: Moving L10N versions of Scoped Dir Access docs\\\" into nyc-dev am:
2c77170adb am:
90a2ba89b1
am:
3d75f7fd97
Change-Id: I5e1082b406ba234ecd295a584afd6adffd9bfd27
Daniel Yu [Thu, 28 Jul 2016 01:50:26 +0000 (01:50 +0000)]
docs: Moving L10N versions of Scoped Dir Access docs am:
a4fc4209c8 am:
c4d1f7a35e
am:
05fdf9b85c
Change-Id: Ia334a58d0b4674f82e3ed230f5001104be9a560c
Daniel Yu [Thu, 28 Jul 2016 01:50:22 +0000 (01:50 +0000)]
Merge \\\"docs: Moving L10N versions of TV recording API docs\\\" into nyc-dev am:
ee7fa57ea6 am:
1f8b805f14
am:
1a286210d0
Change-Id: I3eccd48458c88685bffbf6842e764493410d73d4
Daniel Yu [Thu, 28 Jul 2016 01:47:36 +0000 (01:47 +0000)]
docs: Moving L10N versions of TV recording API docs am:
a93eeaa38b am:
1e255933da
am:
95af3c40fc
Change-Id: I52565c0627d7d8a9653170f22bf224530a7e5db4
Daniel Yu [Thu, 28 Jul 2016 01:47:32 +0000 (01:47 +0000)]
Merge \\\"docs: Moving L10N versions of Direct Boot docs\\\" into nyc-dev am:
3744b05b0e am:
fa70537cd6
am:
1ae6dfc6ad
Change-Id: I4c1c8e38e02523d6cdf4a1a35ab64d579b4df3dc
Daniel Yu [Thu, 28 Jul 2016 01:47:29 +0000 (01:47 +0000)]
docs: Moving L10N versions of Direct Boot docs am:
9bd8e969da am:
6ee0a29bc8
am:
61db5264db
Change-Id: Ia207feea415998a54f047d08f456d6fa2ab1bd8a
Daniel Yu [Thu, 28 Jul 2016 01:47:25 +0000 (01:47 +0000)]
Merge \\\"docs: Moving L10N versions of PIP docs\\\" into nyc-dev am:
1f33503861 am:
67da26112f
am:
dc218c8fcb
Change-Id: I29bd458caea3fe97eee640211a9c56385e1d267a
Daniel Yu [Thu, 28 Jul 2016 01:47:21 +0000 (01:47 +0000)]
docs: Moving L10N versions of PIP docs am:
089055f18c am:
b3d4a4003a
am:
82f3ec0d6e
Change-Id: I73ae7d1412974ded991ea1d4a456f48c89bdaf78
Andrew Solovay [Thu, 28 Jul 2016 01:20:44 +0000 (01:20 +0000)]
Merge \\\"docs: Removed reference to Android Support Library\\\" into nyc-docs am:
2a550cfa2a am:
6a56b0579d
am:
8fb893e96c
Change-Id: I3949b883e85fbef4d465b6d530f3fbc07c98c98a
Andrew Solovay [Thu, 28 Jul 2016 01:20:42 +0000 (01:20 +0000)]
Merge \\"docs: Moving localized versions of N Preview docs\\" into nyc-dev am:
a15c0c2902
am:
c9b1903d84
Change-Id: I49ab4156d5cf98ed919dd357eb813bc2f16d795e
Andrew Solovay [Thu, 28 Jul 2016 01:20:41 +0000 (01:20 +0000)]
docs: Moving localized versions of N Preview docs am:
32845b1eb9
am:
7b0845fea6
Change-Id: I8aa7958902c8a9ffacc10e2279502f4acd8bd441
Andrew Solovay [Thu, 28 Jul 2016 01:16:46 +0000 (01:16 +0000)]
Merge \\"resolve merge conflicts of
07fe016 to nyc-dev\\" into nyc-dev am:
ed49ee64f0
am:
52d5b382ee
Change-Id: I2b3796399eaab85a519b016a069d2f7d606d288b
Andrew Solovay [Thu, 28 Jul 2016 01:16:42 +0000 (01:16 +0000)]
resolve merge conflicts of
07fe016 to nyc-dev am:
0f9a790e0f
am:
19747cb135
Change-Id: I5144e51821212bd099dd59cb9f341692522121b1
Dan Yu [Thu, 28 Jul 2016 01:16:37 +0000 (01:16 +0000)]
Merge \\"docs: Moving L10N versions of Scoped Dir Access docs\\" into nyc-dev am:
2c77170adb
am:
90a2ba89b1
Change-Id: I56299098769d1fc995fc1214485b040a0ef84990
Daniel Yu [Thu, 28 Jul 2016 01:16:31 +0000 (01:16 +0000)]
docs: Moving L10N versions of Scoped Dir Access docs am:
a4fc4209c8
am:
c4d1f7a35e
Change-Id: I4f5d25c33891e841d75fdf51ccad5baf48a5a0f1
Dan Yu [Thu, 28 Jul 2016 01:16:27 +0000 (01:16 +0000)]
Merge \\"docs: Moving L10N versions of TV recording API docs\\" into nyc-dev am:
ee7fa57ea6
am:
1f8b805f14
Change-Id: I8f9c3938e71edc4cb376dc8889bb71f30cce884f
Andrew Solovay [Thu, 28 Jul 2016 01:13:34 +0000 (01:13 +0000)]
Merge changes I17119726,Ia1ae819a into nyc-mr1-dev am:
56fc279b7d
am:
7dcbf967fa
Change-Id: I415dd289e77cab119235b3e8d07af15f76793678
Andrew Solovay [Thu, 28 Jul 2016 01:13:30 +0000 (01:13 +0000)]
Merge \\\"docs: Moving internationalized versions of multi-window doc\\\" into nyc-dev am:
76f3cc7fc0 am:
1108b99e7c
am:
0c97adde47
Change-Id: Ib1bf679c821f85d8df2e14bc87c394008534544b
Andrew Solovay [Thu, 28 Jul 2016 01:13:26 +0000 (01:13 +0000)]
docs: Moving internationalized versions of multi-window doc am:
82a38458e6 am:
8497d93f32
am:
101b9284cc
Change-Id: I97693cbc5cf288c48f1c2ff02a904376ab350507
Andrew Solovay [Thu, 28 Jul 2016 01:13:23 +0000 (01:13 +0000)]
Merge \\"docs: Moving multi-window docs out of N Preview area for N release am:
dda5e4b1ab\\" into nyc-mr1-dev am:
f846766375
am:
4694c23f80
Change-Id: I0ae518a5c206e773e42ffc82f15e21bfc8564e68
Andrew Solovay [Thu, 28 Jul 2016 01:13:19 +0000 (01:13 +0000)]
docs: Moving multi-window docs out of N Preview area for N release am:
dda5e4b1ab am:
3bd12d8e8b
am:
5a33e2172c
Change-Id: Ie06116cd2f37f5c070c0c94488ca2573fb5f078d
Daniel Yu [Thu, 28 Jul 2016 01:13:04 +0000 (01:13 +0000)]
docs: Moving L10N versions of TV recording API docs am:
a93eeaa38b
am:
1e255933da
Change-Id: Ib1b04347d8493a80d9989a69c3949c6c84428b18
Dan Yu [Thu, 28 Jul 2016 01:13:01 +0000 (01:13 +0000)]
Merge \\"docs: Moving L10N versions of Direct Boot docs\\" into nyc-dev am:
3744b05b0e
am:
fa70537cd6
Change-Id: Ice9546e9f37e5d4a9721f2bef038726ea7a37c26
Daniel Yu [Thu, 28 Jul 2016 01:12:59 +0000 (01:12 +0000)]
docs: Moving L10N versions of Direct Boot docs am:
9bd8e969da
am:
6ee0a29bc8
Change-Id: I2b6d7610e865382985e03b540795c44d53a9db51
Dan Yu [Thu, 28 Jul 2016 01:12:57 +0000 (01:12 +0000)]
Merge \\"docs: Moving L10N versions of PIP docs\\" into nyc-dev am:
1f33503861
am:
67da26112f
Change-Id: Ie3b41d8c8f8819653f1908420ca9f196a0194382
Daniel Yu [Thu, 28 Jul 2016 01:12:55 +0000 (01:12 +0000)]
docs: Moving L10N versions of PIP docs am:
089055f18c
am:
b3d4a4003a
Change-Id: I152d7d2c3bd53d0c03e640f411df6a8d2055aadc
Andrew Solovay [Thu, 28 Jul 2016 01:04:07 +0000 (01:04 +0000)]
Merge changes I67077905,Ibe3ae323 into nyc-mr1-dev am:
bc819e604f
am:
c10534685a
Change-Id: Ic2422dc76f17c623cecbacd935a0b465910c5c2d
Andrew Solovay [Thu, 28 Jul 2016 01:04:03 +0000 (01:04 +0000)]
Merge \\\"docs: Removing internationalized versions of AfW preview doc\\\" into nyc-dev am:
40782b2415 am:
948bb428ae
am:
e81a547e81
Change-Id: Ied3d7214346d11aff38100d58bec1041feae3ccf
Andrew Solovay [Thu, 28 Jul 2016 01:03:59 +0000 (01:03 +0000)]
docs: Removing internationalized versions of AfW preview doc am:
d6d4de697e am:
74c7ef917f
am:
b5804ff8fa
Change-Id: Ibd645c921fcbe04f9a5966fd46c4e39ee4304ba2
Andrew Solovay [Thu, 28 Jul 2016 01:03:22 +0000 (01:03 +0000)]
Merge \\"docs: Removed reference to Android Support Library\\" into nyc-docs am:
2a550cfa2a
am:
6a56b0579d
Change-Id: I896eb99e5a240ceb402f7b2ef510845861cf408f
Andrew Solovay [Thu, 28 Jul 2016 01:03:18 +0000 (01:03 +0000)]
Merge \"docs: Moving localized versions of N Preview docs\" into nyc-dev
am:
a15c0c2902
Change-Id: I53c333168a7a26fc8e2bcc10ab62bd555fc67581
Andrew Solovay [Thu, 28 Jul 2016 01:03:14 +0000 (01:03 +0000)]
docs: Moving localized versions of N Preview docs
am:
32845b1eb9
Change-Id: I549825e683afa9bd855dce58dff8bbef86a71ad3
Andrew Solovay [Thu, 28 Jul 2016 01:01:23 +0000 (01:01 +0000)]
Merge changes Ie43bcbcd,Ia9901a83 into nyc-mr1-dev am:
762dc30ad5
am:
30cb846c33
Change-Id: Ia32442e06c345df9b0d5084c9f5997b69d070c8d
Andrew Solovay [Thu, 28 Jul 2016 01:01:20 +0000 (01:01 +0000)]
Merge \\\"docs: Removing N Preview AfW doc, and setting up redirect\\\" into nyc-dev am:
15e72ce64b am:
a3072a31c8
am:
48569cb18a
Change-Id: I7f8841f82feb3593371c997d1dbcd38a776efe87
Andrew Solovay [Thu, 28 Jul 2016 01:01:16 +0000 (01:01 +0000)]
docs: Removing N Preview AfW doc, and setting up redirect am:
09f5a77754 am:
a8f987a63d
am:
dc63ac21d9
Change-Id: Iab78382da3b429e02a9791b759f48012f3efb0f0
Andrew Solovay [Thu, 28 Jul 2016 01:01:12 +0000 (01:01 +0000)]
Merge changes Ibed11e8a,Ic6bf0c4b into nyc-mr1-dev am:
e7ee805c6a
am:
59a69e5ef8
Change-Id: I7470e33ffb8d120ed5cd56dcfa479c886b5d3426
Andrew Solovay [Thu, 28 Jul 2016 01:01:08 +0000 (01:01 +0000)]
Merge \\\"docs: Added Android N (API level 24) to the \\\"API levels\\\" table\\\" into nyc-dev am:
ffe63a4ad8 am:
89d4427097
am:
ba293d3488
Change-Id: I0511313259bac9b2eba17348efb01653fa91cdce
Andrew Solovay [Thu, 28 Jul 2016 00:58:14 +0000 (00:58 +0000)]
docs: Added Android N (API level 24) to the \\\"API levels\\\" table am:
563c4f1adb am:
bcfcb6d81c
am:
8c1796e935
Change-Id: I26cc8b1ce40e69bf0458fe401de6c9ee8e9b7c46
Andrew Solovay [Thu, 28 Jul 2016 00:58:10 +0000 (00:58 +0000)]
Merge changes I17119726,Ia1ae819a into nyc-mr1-dev
am:
56fc279b7d
Change-Id: I8be5efd510bfd81097747451ee7adf62e8b36544
Sergei Vasilinetc [Thu, 28 Jul 2016 00:58:10 +0000 (00:58 +0000)]
Merge \\"Turn off simplePath optimization then Path object is used as out param\\" into nyc-mr1-dev am:
9b17ebca8f
am:
a00a5326d4
Change-Id: I735adcd4ef236a2a355e1bba831132406cb2f44e
Andrew Solovay [Thu, 28 Jul 2016 00:58:07 +0000 (00:58 +0000)]
Merge \"resolve merge conflicts of
07fe016 to nyc-dev\" into nyc-dev
am:
ed49ee64f0
Change-Id: I4974eee1e932ee9568c3f40517808b7f904fa138
Andrew Solovay [Thu, 28 Jul 2016 00:58:07 +0000 (00:58 +0000)]
Merge \\"docs: Moving internationalized versions of multi-window doc\\" into nyc-dev am:
76f3cc7fc0
am:
1108b99e7c
Change-Id: If8c42f1b9f899a5bed891ed08d3ef4e03a4a924c
sergeyv [Thu, 28 Jul 2016 00:58:07 +0000 (00:58 +0000)]
Turn off simplePath optimization then Path object is used as out param am:
a6a8557d6e
am:
2ef3bdbd7a
Change-Id: I7e1a028c2b7596e2697fd319a6c899ce92a4fcc8
Andrew Solovay [Thu, 28 Jul 2016 00:58:05 +0000 (00:58 +0000)]
resolve merge conflicts of
07fe016 to nyc-dev
am:
0f9a790e0f
Change-Id: Ide59077e2c6b9bd259758e8526847c93ca392415
Adrian Roos [Thu, 28 Jul 2016 00:58:03 +0000 (00:58 +0000)]
Merge \\"Keyguard: Reapply insets when fitsSystemWindow changes\\" into nyc-mr1-dev am:
5e0a42848e
am:
7c323ce7d7
Change-Id: I75436b8798faef545f67193728b72043e90f488c
Andrew Solovay [Thu, 28 Jul 2016 00:58:02 +0000 (00:58 +0000)]
docs: Moving internationalized versions of multi-window doc am:
82a38458e6
am:
8497d93f32
Change-Id: I2573f5d3e84fbc2d2f5dc103edde551535b5700a
Daniel Yu [Thu, 28 Jul 2016 00:58:00 +0000 (00:58 +0000)]
Merge \"docs: Moving L10N versions of Scoped Dir Access docs\" into nyc-dev
am:
2c77170adb
Change-Id: I8870a49206fc2c83826d4f06cbd28085f4b4cfd5
Adrian Roos [Thu, 28 Jul 2016 00:57:59 +0000 (00:57 +0000)]
Keyguard: Reapply insets when fitsSystemWindow changes am:
a5d6cd0981
am:
cc0c27f9a9
Change-Id: I9a201240bb6cf2db9bb1054430557429dad94ca8
Daniel Yu [Thu, 28 Jul 2016 00:57:57 +0000 (00:57 +0000)]
docs: Moving L10N versions of Scoped Dir Access docs
am:
a4fc4209c8
Change-Id: Ie3661f2dcedde9f2d5fc3828d815150c3e7329d5
Andrew Solovay [Thu, 28 Jul 2016 00:57:57 +0000 (00:57 +0000)]
Merge \"docs: Moving multi-window docs out of N Preview area for N release am:
dda5e4b1ab\" into nyc-mr1-dev
am:
f846766375
Change-Id: I975db10bb20afb29dde1d750c199a1facccfce7e
Daniel Yu [Thu, 28 Jul 2016 00:57:53 +0000 (00:57 +0000)]
Merge \"docs: Moving L10N versions of TV recording API docs\" into nyc-dev
am:
ee7fa57ea6
Change-Id: Icc620282440bb907deeeb8488d640b96254cbc30
Andrew Solovay [Thu, 28 Jul 2016 00:57:53 +0000 (00:57 +0000)]
docs: Moving multi-window docs out of N Preview area for N release am:
dda5e4b1ab
am:
3bd12d8e8b
Change-Id: I1c0115e24df8adbdf3464056dfc14ef8f328d09d
Daniel Yu [Thu, 28 Jul 2016 00:57:50 +0000 (00:57 +0000)]
docs: Moving L10N versions of TV recording API docs
am:
a93eeaa38b
Change-Id: Iee157cb4494cf2aaffc232f88a315fcacf80cf0b
Daniel Yu [Thu, 28 Jul 2016 00:57:47 +0000 (00:57 +0000)]
Merge \"docs: Moving L10N versions of Direct Boot docs\" into nyc-dev
am:
3744b05b0e
Change-Id: I64e42e1e9a002312796e28d3edccfbe6bb3941e6
Daniel Yu [Thu, 28 Jul 2016 00:57:44 +0000 (00:57 +0000)]
docs: Moving L10N versions of Direct Boot docs
am:
9bd8e969da
Change-Id: I2b1748d28c351af0f19b25be13ae012487c91101
Daniel Yu [Thu, 28 Jul 2016 00:57:41 +0000 (00:57 +0000)]
Merge \"docs: Moving L10N versions of PIP docs\" into nyc-dev
am:
1f33503861
Change-Id: I517a167a6a9f45c0ab3b98adcb465cc1e3568977
Daniel Yu [Thu, 28 Jul 2016 00:57:37 +0000 (00:57 +0000)]
docs: Moving L10N versions of PIP docs
am:
089055f18c
Change-Id: Ic370a01cc76dbf7f44c8c4b55b965ac265bc2b76
Andrew Solovay [Thu, 28 Jul 2016 00:42:44 +0000 (00:42 +0000)]
Merge \\"docs: Moving localized versions of N Preview docs\\" into nyc-dev am:
a15c0c2902
am:
c45e32cca2
Change-Id: If19786a0702fdfdadb3849ee165ce89ad4c48b73
Andrew Solovay [Thu, 28 Jul 2016 00:42:42 +0000 (00:42 +0000)]
docs: Moving localized versions of N Preview docs am:
32845b1eb9
am:
bf5981d319
Change-Id: I2b8197150536ddb4cc6ab86a9e56a0bfc213ebff
Andrew Solovay [Thu, 28 Jul 2016 00:34:19 +0000 (00:34 +0000)]
Merge changes I67077905,Ibe3ae323 into nyc-mr1-dev
am:
bc819e604f
Change-Id: I6e6b155d703d3377ed710f8a03658b2c6338a2b1
Andrew Solovay [Thu, 28 Jul 2016 00:34:16 +0000 (00:34 +0000)]
Merge \\"docs: Removing internationalized versions of AfW preview doc\\" into nyc-dev am:
40782b2415
am:
948bb428ae
Change-Id: I1076b0c06629d8cec5ce5d627784b928b0e1a1c0
Andrew Solovay [Thu, 28 Jul 2016 00:34:11 +0000 (00:34 +0000)]
docs: Removing internationalized versions of AfW preview doc am:
d6d4de697e
am:
74c7ef917f
Change-Id: Ifd56ac58e6ce9e6e7c86d52a242d8598ecd25c02
Andrew Solovay [Thu, 28 Jul 2016 00:34:06 +0000 (00:34 +0000)]
Merge changes Ie43bcbcd,Ia9901a83 into nyc-mr1-dev
am:
762dc30ad5
Change-Id: I6fa6eff5ec93a0f4a1b8c6e99a36c874f9bb1757
Andrew Solovay [Thu, 28 Jul 2016 00:34:04 +0000 (00:34 +0000)]
Merge \\"docs: Removing N Preview AfW doc, and setting up redirect\\" into nyc-dev am:
15e72ce64b
am:
a3072a31c8
Change-Id: Ida4f7135827efca4d06500a8250b8b63c00bb4a3
Andrew Solovay [Thu, 28 Jul 2016 00:33:59 +0000 (00:33 +0000)]
docs: Removing N Preview AfW doc, and setting up redirect am:
09f5a77754
am:
a8f987a63d
Change-Id: Id072a40e864084e5f1d18b6ec927bfbd2464d117
Andrew Solovay [Thu, 28 Jul 2016 00:33:54 +0000 (00:33 +0000)]
Merge changes Ibed11e8a,Ic6bf0c4b into nyc-mr1-dev
am:
e7ee805c6a
Change-Id: Iffdac7529ce141885dbe582899ef4aadf799ec8e
Andrew Solovay [Thu, 28 Jul 2016 00:33:51 +0000 (00:33 +0000)]
Merge \\"docs: Added Android N (API level 24) to the \\"API levels\\" table\\" into nyc-dev am:
ffe63a4ad8
am:
89d4427097
Change-Id: I529a3bde8e24220aff429b356d030a09319fc641
Andrew Solovay [Thu, 28 Jul 2016 00:33:47 +0000 (00:33 +0000)]
docs: Added Android N (API level 24) to the \\"API levels\\" table am:
563c4f1adb
am:
bcfcb6d81c
Change-Id: Iaeecfbf646b48828d1f179637ad624b512485269
sergeyv [Thu, 28 Jul 2016 00:33:35 +0000 (00:33 +0000)]
Merge \"Turn off simplePath optimization then Path object is used as out param\" into nyc-mr1-dev
am:
9b17ebca8f
Change-Id: I9ae9e45a87d48545ae4126b3288bb76767460bb5
Andrew Solovay [Thu, 28 Jul 2016 00:32:54 +0000 (00:32 +0000)]
Merge \"docs: Moving localized versions of N Preview docs\" into nyc-dev
am:
a15c0c2902
Change-Id: Ia39604f24d4580a10212240e018aa06fb6f3667e
sergeyv [Thu, 28 Jul 2016 00:32:46 +0000 (00:32 +0000)]
Turn off simplePath optimization then Path object is used as out param
am:
a6a8557d6e
Change-Id: Ia9b85e52b6f0c8632989bf58ac97771ffc2a5d8d
Andrew Solovay [Thu, 28 Jul 2016 00:32:42 +0000 (00:32 +0000)]
docs: Moving localized versions of N Preview docs
am:
32845b1eb9
Change-Id: I44bd161a0a21e6f7d81ece030cb0a272442c3e9f
Adrian Roos [Thu, 28 Jul 2016 00:31:45 +0000 (00:31 +0000)]
Merge \"Keyguard: Reapply insets when fitsSystemWindow changes\" into nyc-mr1-dev
am:
5e0a42848e
Change-Id: I09d4b43ba3af1db2a7eea299fdf6f6a760330283
Adrian Roos [Thu, 28 Jul 2016 00:31:43 +0000 (00:31 +0000)]
Keyguard: Reapply insets when fitsSystemWindow changes
am:
a5d6cd0981
Change-Id: Id5a004656b5b1443b8c30a7a7b72a64825f057a1
Andrew Solovay [Thu, 28 Jul 2016 00:30:34 +0000 (00:30 +0000)]
Merge \"docs: Removed reference to Android Support Library\" into nyc-docs
am:
2a550cfa2a
Change-Id: Ie271602e418e65318b5a04831dd0b5330518e602
Andrew Solovay [Thu, 28 Jul 2016 00:24:08 +0000 (00:24 +0000)]
Merge \\"resolve merge conflicts of
07fe016 to nyc-dev\\" into nyc-dev am:
ed49ee64f0
am:
64e4e6e549
Change-Id: Ic074d4d47bc5f3fa15058aa92c6e40693180a61e
Andrew Solovay [Thu, 28 Jul 2016 00:24:02 +0000 (00:24 +0000)]
resolve merge conflicts of
07fe016 to nyc-dev am:
0f9a790e0f
am:
238ea71c51
Change-Id: I5d4fc9657b39ed0624274f7cf0ed34ec680eb9a8
Dan Yu [Thu, 28 Jul 2016 00:23:55 +0000 (00:23 +0000)]
Merge \\"docs: Moving L10N versions of Scoped Dir Access docs\\" into nyc-dev am:
2c77170adb
am:
3c733da11e
Change-Id: I1dfff992504fd7650ac800a1be2db32b1bd4ae0c
Daniel Yu [Thu, 28 Jul 2016 00:20:11 +0000 (00:20 +0000)]
docs: Moving L10N versions of Scoped Dir Access docs am:
a4fc4209c8
am:
9079210b36
Change-Id: I846cd71e6cfd6f037126fe45ec676beb0f4b67b8
Dan Yu [Thu, 28 Jul 2016 00:20:09 +0000 (00:20 +0000)]
Merge \\"docs: Moving L10N versions of TV recording API docs\\" into nyc-dev am:
ee7fa57ea6
am:
6569cc9b93
Change-Id: I7f9990e8be02d76502f790a2092dd743a436f40d
Daniel Yu [Thu, 28 Jul 2016 00:20:05 +0000 (00:20 +0000)]
docs: Moving L10N versions of TV recording API docs am:
a93eeaa38b
am:
63470f763a
Change-Id: I1f66b6c2181b996b686ce1d2b4b4f5667efbadbd
Dan Yu [Thu, 28 Jul 2016 00:20:02 +0000 (00:20 +0000)]
Merge \\"docs: Moving L10N versions of Direct Boot docs\\" into nyc-dev am:
3744b05b0e
am:
c14527f2cd
Change-Id: I0de57d9c28b9c75cd02ed160508ae103a4c133d3
Daniel Yu [Thu, 28 Jul 2016 00:19:59 +0000 (00:19 +0000)]
docs: Moving L10N versions of Direct Boot docs am:
9bd8e969da
am:
48e4ccc396
Change-Id: I49319324e8515eff165edcd18cfa435058dd93f0
Android Build Merger (Role) [Thu, 28 Jul 2016 00:10:42 +0000 (00:10 +0000)]
Merge "Merge \\"Polish around locked user communication.\\" into nyc-mr1-dev am:
9882960460 am:
f624e7aefb" into nyc-mr1-dev-plus-aosp
Jeff Sharkey [Thu, 28 Jul 2016 00:10:16 +0000 (00:10 +0000)]
Merge \\"Polish around locked user communication.\\" into nyc-mr1-dev am:
9882960460
am:
f624e7aefb
Change-Id: If69cf5de62517fdeaf33f60c53b6564b7b637f24
Android Build Merger (Role) [Thu, 28 Jul 2016 00:07:42 +0000 (00:07 +0000)]
Merge "Polish around locked user communication. am:
b6edaa952e am:
9a0e0021a4" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 28 Jul 2016 00:07:18 +0000 (00:07 +0000)]
Merge "Merge \\"Allow restarting foreground services once\\" into nyc-mr1-dev am:
6a1dcb635f am:
378c455ec2" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 28 Jul 2016 00:07:07 +0000 (00:07 +0000)]
Merge "Allow restarting foreground services once am:
805ea307e7 am:
d64259954f" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 28 Jul 2016 00:06:44 +0000 (00:06 +0000)]
Merge "Merge \\"docs: Moving L10N versions of PIP docs\\" into nyc-dev am:
1f33503861 am:
f7c9eec3fd" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 28 Jul 2016 00:06:35 +0000 (00:06 +0000)]
Merge "Merge \\"Docs: Migrating platform docs to /guide/platform/ with new landing page am:
cf150dd245\\" into nyc-mr1-dev am:
b034410564 am:
f90bbe7586" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 28 Jul 2016 00:06:32 +0000 (00:06 +0000)]
Merge "docs: Moving L10N versions of PIP docs am:
089055f18c am:
e6772cc642" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 28 Jul 2016 00:06:23 +0000 (00:06 +0000)]
Merge "Docs: Migrating platform docs to /guide/platform/ with new landing page am:
cf150dd245 am:
5ffeb645fe am:
71b6e0012b" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 28 Jul 2016 00:06:17 +0000 (00:06 +0000)]
Merge "Merge \\"docs: Moving internationalized versions of multi-window doc\\" into nyc-dev am:
76f3cc7fc0 am:
6ecad9689b" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 28 Jul 2016 00:05:55 +0000 (00:05 +0000)]
Merge "docs: Moving internationalized versions of multi-window doc am:
82a38458e6 am:
d736ab23dd" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 28 Jul 2016 00:05:43 +0000 (00:05 +0000)]
Merge "docs: Moving multi-window docs out of N Preview area for N release am:
dda5e4b1ab am:
37b4ca58e7" into nyc-mr1-dev-plus-aosp