Commit Graph

249860 Commits

Author SHA1 Message Date
Andrew Solovay
0fb2ddcc2d docs: Fixed bad link to cloud-backup training class am: c02411f38d am: 7e7924b074
am: a0f7338634

Change-Id: Ie699f9ce2247f4d384b1b8180c515a6e13b6979a
2016-07-28 01:20:46 +00:00
Andrew Solovay
8f6e247913 Merge \\\"docs: Removed reference to Android Support Library\\\" into nyc-docs am: 2a550cfa2a am: 6a56b0579d
am: 8fb893e96c

Change-Id: I3949b883e85fbef4d465b6d530f3fbc07c98c98a
2016-07-28 01:20:44 +00:00
Andrew Solovay
e13ba26571 Merge \\"docs: Moving localized versions of N Preview docs\\" into nyc-dev am: a15c0c2902
am: c9b1903d84

Change-Id: I49ab4156d5cf98ed919dd357eb813bc2f16d795e
2016-07-28 01:20:42 +00:00
Andrew Solovay
9371b0d8eb docs: Moving localized versions of N Preview docs am: 32845b1eb9
am: 7b0845fea6

Change-Id: I8aa7958902c8a9ffacc10e2279502f4acd8bd441
2016-07-28 01:20:41 +00:00
Andrew Solovay
f0ca1c16d7 Merge \\"resolve merge conflicts of 07fe016 to nyc-dev\\" into nyc-dev am: ed49ee64f0
am: 52d5b382ee

Change-Id: I2b3796399eaab85a519b016a069d2f7d606d288b
2016-07-28 01:16:46 +00:00
Andrew Solovay
c03ee73ec2 resolve merge conflicts of 07fe016 to nyc-dev am: 0f9a790e0f
am: 19747cb135

Change-Id: I5144e51821212bd099dd59cb9f341692522121b1
2016-07-28 01:16:42 +00:00
Dan Yu
3d75f7fd97 Merge \\"docs: Moving L10N versions of Scoped Dir Access docs\\" into nyc-dev am: 2c77170adb
am: 90a2ba89b1

Change-Id: I56299098769d1fc995fc1214485b040a0ef84990
2016-07-28 01:16:37 +00:00
Daniel Yu
05fdf9b85c docs: Moving L10N versions of Scoped Dir Access docs am: a4fc4209c8
am: c4d1f7a35e

Change-Id: I4f5d25c33891e841d75fdf51ccad5baf48a5a0f1
2016-07-28 01:16:31 +00:00
Dan Yu
1a286210d0 Merge \\"docs: Moving L10N versions of TV recording API docs\\" into nyc-dev am: ee7fa57ea6
am: 1f8b805f14

Change-Id: I8f9c3938e71edc4cb376dc8889bb71f30cce884f
2016-07-28 01:16:27 +00:00
Daniel Yu
95af3c40fc docs: Moving L10N versions of TV recording API docs am: a93eeaa38b
am: 1e255933da

Change-Id: Ib1b04347d8493a80d9989a69c3949c6c84428b18
2016-07-28 01:13:04 +00:00
Dan Yu
1ae6dfc6ad Merge \\"docs: Moving L10N versions of Direct Boot docs\\" into nyc-dev am: 3744b05b0e
am: fa70537cd6

Change-Id: Ice9546e9f37e5d4a9721f2bef038726ea7a37c26
2016-07-28 01:13:01 +00:00
Daniel Yu
61db5264db docs: Moving L10N versions of Direct Boot docs am: 9bd8e969da
am: 6ee0a29bc8

Change-Id: I2b6d7610e865382985e03b540795c44d53a9db51
2016-07-28 01:12:59 +00:00
Dan Yu
dc218c8fcb Merge \\"docs: Moving L10N versions of PIP docs\\" into nyc-dev am: 1f33503861
am: 67da26112f

Change-Id: Ie3b41d8c8f8819653f1908420ca9f196a0194382
2016-07-28 01:12:57 +00:00
Daniel Yu
82f3ec0d6e docs: Moving L10N versions of PIP docs am: 089055f18c
am: b3d4a4003a

Change-Id: I152d7d2c3bd53d0c03e640f411df6a8d2055aadc
2016-07-28 01:12:55 +00:00
Andrew Solovay
a0f7338634 docs: Fixed bad link to cloud-backup training class am: c02411f38d
am: 7e7924b074

Change-Id: I5a7b203aa59ecc3d43bedb43f497096602d94295
2016-07-28 01:03:25 +00:00
Andrew Solovay
8fb893e96c Merge \\"docs: Removed reference to Android Support Library\\" into nyc-docs am: 2a550cfa2a
am: 6a56b0579d

Change-Id: I896eb99e5a240ceb402f7b2ef510845861cf408f
2016-07-28 01:03:22 +00:00
Andrew Solovay
c9b1903d84 Merge \"docs: Moving localized versions of N Preview docs\" into nyc-dev
am: a15c0c2902

Change-Id: I53c333168a7a26fc8e2bcc10ab62bd555fc67581
2016-07-28 01:03:18 +00:00
Andrew Solovay
7b0845fea6 docs: Moving localized versions of N Preview docs
am: 32845b1eb9

Change-Id: I549825e683afa9bd855dce58dff8bbef86a71ad3
2016-07-28 01:03:14 +00:00
Andrew Solovay
7dcbf967fa Merge changes I17119726,Ia1ae819a into nyc-mr1-dev
am: 56fc279b7d

Change-Id: I8be5efd510bfd81097747451ee7adf62e8b36544
2016-07-28 00:58:10 +00:00
Andrew Solovay
52d5b382ee Merge \"resolve merge conflicts of 07fe016 to nyc-dev\" into nyc-dev
am: ed49ee64f0

Change-Id: I4974eee1e932ee9568c3f40517808b7f904fa138
2016-07-28 00:58:07 +00:00
Andrew Solovay
0c97adde47 Merge \\"docs: Moving internationalized versions of multi-window doc\\" into nyc-dev am: 76f3cc7fc0
am: 1108b99e7c

Change-Id: If8c42f1b9f899a5bed891ed08d3ef4e03a4a924c
2016-07-28 00:58:07 +00:00
Andrew Solovay
19747cb135 resolve merge conflicts of 07fe016 to nyc-dev
am: 0f9a790e0f

Change-Id: Ide59077e2c6b9bd259758e8526847c93ca392415
2016-07-28 00:58:05 +00:00
Andrew Solovay
101b9284cc docs: Moving internationalized versions of multi-window doc am: 82a38458e6
am: 8497d93f32

Change-Id: I2573f5d3e84fbc2d2f5dc103edde551535b5700a
2016-07-28 00:58:02 +00:00
Daniel Yu
90a2ba89b1 Merge \"docs: Moving L10N versions of Scoped Dir Access docs\" into nyc-dev
am: 2c77170adb

Change-Id: I8870a49206fc2c83826d4f06cbd28085f4b4cfd5
2016-07-28 00:58:00 +00:00
Daniel Yu
c4d1f7a35e docs: Moving L10N versions of Scoped Dir Access docs
am: a4fc4209c8

Change-Id: Ie3661f2dcedde9f2d5fc3828d815150c3e7329d5
2016-07-28 00:57:57 +00:00
Andrew Solovay
4694c23f80 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
2016-07-28 00:57:57 +00:00
Daniel Yu
1f8b805f14 Merge \"docs: Moving L10N versions of TV recording API docs\" into nyc-dev
am: ee7fa57ea6

Change-Id: Icc620282440bb907deeeb8488d640b96254cbc30
2016-07-28 00:57:53 +00:00
Andrew Solovay
5a33e2172c docs: Moving multi-window docs out of N Preview area for N release am: dda5e4b1ab
am: 3bd12d8e8b

Change-Id: I1c0115e24df8adbdf3464056dfc14ef8f328d09d
2016-07-28 00:57:53 +00:00
Daniel Yu
1e255933da docs: Moving L10N versions of TV recording API docs
am: a93eeaa38b

Change-Id: Iee157cb4494cf2aaffc232f88a315fcacf80cf0b
2016-07-28 00:57:50 +00:00
Daniel Yu
fa70537cd6 Merge \"docs: Moving L10N versions of Direct Boot docs\" into nyc-dev
am: 3744b05b0e

Change-Id: I64e42e1e9a002312796e28d3edccfbe6bb3941e6
2016-07-28 00:57:47 +00:00
Daniel Yu
6ee0a29bc8 docs: Moving L10N versions of Direct Boot docs
am: 9bd8e969da

Change-Id: I2b1748d28c351af0f19b25be13ae012487c91101
2016-07-28 00:57:44 +00:00
Daniel Yu
67da26112f Merge \"docs: Moving L10N versions of PIP docs\" into nyc-dev
am: 1f33503861

Change-Id: I517a167a6a9f45c0ab3b98adcb465cc1e3568977
2016-07-28 00:57:41 +00:00
Daniel Yu
b3d4a4003a docs: Moving L10N versions of PIP docs
am: 089055f18c

Change-Id: Ic370a01cc76dbf7f44c8c4b55b965ac265bc2b76
2016-07-28 00:57:37 +00:00
Andrew Solovay
c10534685a Merge changes I67077905,Ibe3ae323 into nyc-mr1-dev
am: bc819e604f

Change-Id: I6e6b155d703d3377ed710f8a03658b2c6338a2b1
2016-07-28 00:34:19 +00:00
Andrew Solovay
e81a547e81 Merge \\"docs: Removing internationalized versions of AfW preview doc\\" into nyc-dev am: 40782b2415
am: 948bb428ae

Change-Id: I1076b0c06629d8cec5ce5d627784b928b0e1a1c0
2016-07-28 00:34:16 +00:00
Andrew Solovay
b5804ff8fa docs: Removing internationalized versions of AfW preview doc am: d6d4de697e
am: 74c7ef917f

Change-Id: Ifd56ac58e6ce9e6e7c86d52a242d8598ecd25c02
2016-07-28 00:34:11 +00:00
Andrew Solovay
30cb846c33 Merge changes Ie43bcbcd,Ia9901a83 into nyc-mr1-dev
am: 762dc30ad5

Change-Id: I6fa6eff5ec93a0f4a1b8c6e99a36c874f9bb1757
2016-07-28 00:34:06 +00:00
Andrew Solovay
48569cb18a Merge \\"docs: Removing N Preview AfW doc, and setting up redirect\\" into nyc-dev am: 15e72ce64b
am: a3072a31c8

Change-Id: Ida4f7135827efca4d06500a8250b8b63c00bb4a3
2016-07-28 00:34:04 +00:00
Andrew Solovay
dc63ac21d9 docs: Removing N Preview AfW doc, and setting up redirect am: 09f5a77754
am: a8f987a63d

Change-Id: Id072a40e864084e5f1d18b6ec927bfbd2464d117
2016-07-28 00:33:59 +00:00
Andrew Solovay
59a69e5ef8 Merge changes Ibed11e8a,Ic6bf0c4b into nyc-mr1-dev
am: e7ee805c6a

Change-Id: Iffdac7529ce141885dbe582899ef4aadf799ec8e
2016-07-28 00:33:54 +00:00
Andrew Solovay
ba293d3488 Merge \\"docs: Added Android N (API level 24) to the \\"API levels\\" table\\" into nyc-dev am: ffe63a4ad8
am: 89d4427097

Change-Id: I529a3bde8e24220aff429b356d030a09319fc641
2016-07-28 00:33:51 +00:00
Andrew Solovay
8c1796e935 docs: Added Android N (API level 24) to the \\"API levels\\" table am: 563c4f1adb
am: bcfcb6d81c

Change-Id: Iaeecfbf646b48828d1f179637ad624b512485269
2016-07-28 00:33:47 +00:00
sergeyv
a00a5326d4 Merge \"Turn off simplePath optimization then Path object is used as out param\" into nyc-mr1-dev
am: 9b17ebca8f

Change-Id: I9ae9e45a87d48545ae4126b3288bb76767460bb5
2016-07-28 00:33:35 +00:00
sergeyv
2ef3bdbd7a Turn off simplePath optimization then Path object is used as out param
am: a6a8557d6e

Change-Id: Ia9b85e52b6f0c8632989bf58ac97771ffc2a5d8d
2016-07-28 00:32:46 +00:00
Adrian Roos
7c323ce7d7 Merge \"Keyguard: Reapply insets when fitsSystemWindow changes\" into nyc-mr1-dev
am: 5e0a42848e

Change-Id: I09d4b43ba3af1db2a7eea299fdf6f6a760330283
2016-07-28 00:31:45 +00:00
Adrian Roos
cc0c27f9a9 Keyguard: Reapply insets when fitsSystemWindow changes
am: a5d6cd0981

Change-Id: Id5a004656b5b1443b8c30a7a7b72a64825f057a1
2016-07-28 00:31:43 +00:00
Andrew Solovay
7e7924b074 docs: Fixed bad link to cloud-backup training class
am: c02411f38d

Change-Id: I407879f4ec8fbdfae3551c042dc30e38384ef235
2016-07-28 00:30:37 +00:00
Andrew Solovay
6a56b0579d Merge \"docs: Removed reference to Android Support Library\" into nyc-docs
am: 2a550cfa2a

Change-Id: Ie271602e418e65318b5a04831dd0b5330518e602
2016-07-28 00:30:34 +00:00
Andrew Solovay
a15c0c2902 Merge "docs: Moving localized versions of N Preview docs" into nyc-dev 2016-07-28 00:00:01 +00:00
Android Build Merger (Role)
56fc279b7d Merge changes I17119726,Ia1ae819a into nyc-mr1-dev
* changes:
  Merge \"docs: Moving internationalized versions of multi-window doc\" into nyc-dev am: 76f3cc7fc0
  docs: Moving internationalized versions of multi-window doc am: 82a38458e6
2016-07-27 23:58:19 +00:00