OSDN Git Service
Adam Lesinski [Fri, 29 Jul 2016 16:10:11 +0000 (16:10 +0000)]
Fix nesting of sample XML code in complex-resources doc am:
79a5b91d0d am:
d779894510 am:
3a45979ab0 am:
9c8423b4bb
am:
df8f53939b
Change-Id: I105ec6b3f36239d8ed9e555e979a7fe489b9ce88
Jorim Jaggi [Fri, 29 Jul 2016 16:10:07 +0000 (16:10 +0000)]
Merge \\\"Follow up for I420bee8a11d430b1e52ded050536e56a85a48800\\\" into nyc-mr1-dev am:
ca5310dd5f am:
77a7fea6eb
am:
ce4f102e53
Change-Id: I304d6f1f7bbb7e91252e05811b784117e44b756f
Jorim Jaggi [Fri, 29 Jul 2016 16:07:35 +0000 (16:07 +0000)]
Follow up for I420bee8a11d430b1e52ded050536e56a85a48800 am:
8d4f5f52a1 am:
ffb289c7b3
am:
f878d518c1
Change-Id: I45a3a50685cceb2c59476a236cb883846ae0f51a
Adam Lesinski [Fri, 29 Jul 2016 16:07:31 +0000 (16:07 +0000)]
Merge \"Fix nesting of sample XML code in complex-resources doc am:
79a5b91d0d am:
d779894510 am:
564a534f33\" into nyc-mr1-dev-plus-aosp
am:
63736dae3e
Change-Id: I7f695c5a3354e6f303a07061d0d4634d70d45d76
Adam Lesinski [Fri, 29 Jul 2016 16:07:27 +0000 (16:07 +0000)]
Fix nesting of sample XML code in complex-resources doc am:
79a5b91d0d am:
d779894510 am:
564a534f33
am:
a84d84f26d
Change-Id: I05e79b916b8258a2bbd5b09fcffe0d11dcb0c86f
Anthony Hugh [Fri, 29 Jul 2016 16:07:18 +0000 (16:07 +0000)]
Merge \\"Update Priority Only defaults on Watch to not include Repeat Callers\\" into cw-f-dev am:
513d3e7073
am:
47cb7c2482
Change-Id: Ic6e058cc0fab197e60ef16496fc7bab7784d8227
Anthony Hugh [Fri, 29 Jul 2016 16:06:46 +0000 (16:06 +0000)]
Update Priority Only defaults on Watch to not include Repeat Callers am:
c04e68f0a5
am:
29bcc1067b
Change-Id: Ideb92773647a0518d637acb6f5142dc0b324b556
Adam Lesinski [Fri, 29 Jul 2016 16:06:41 +0000 (16:06 +0000)]
Merge \\\"DO NOT MERGE Change KernelUidCpuTimeReader Slog.wtf to Slog.e\\\" into nyc-mr1-dev am:
533159b4f9 am:
e65da1061f
am:
297267f4f9 -s ours
Change-Id: Ic0bd531bdabb25fc2501753ac401c201aec4f97b
TreeHugger Robot [Fri, 29 Jul 2016 13:35:17 +0000 (13:35 +0000)]
Merge "fix javadoc for grantRuntimePermission"
Adam Lesinski [Fri, 29 Jul 2016 02:33:15 +0000 (02:33 +0000)]
DO NOT MERGE Change KernelUidCpuTimeReader Slog.wtf to Slog.e am:
82a4d6f93b am:
52d7fd62a4
am:
387c351d5a -s ours
Change-Id: I13fa3104c114e2cb0316990db22424754cc36b00
Adam Lesinski [Fri, 29 Jul 2016 02:33:13 +0000 (02:33 +0000)]
Merge \\\"Fix nesting of sample XML code in complex-resources doc\\\" into nyc-mr1-dev am:
c8c98ce254 am:
d70b8aa35e
am:
e1455eb5ff
Change-Id: I43ad798d16774555f66c809c272ac9774b2daeee
Adam Lesinski [Fri, 29 Jul 2016 02:33:10 +0000 (02:33 +0000)]
Fix nesting of sample XML code in complex-resources doc am:
4d1e2adf60 am:
6782ef9aa2
am:
4b9a4ed9a8
Change-Id: Iabf6e50f8668494cc16eadc794b6562f7b604d9c
Robert Greenwalt [Fri, 29 Jul 2016 02:33:06 +0000 (02:33 +0000)]
Merge \\\"Add support to hide LTE+ in UI.\\\" into nyc-mr1-dev am:
0a39c8f1c9 am:
0a8c44fa58
am:
4713272144
Change-Id: Ib528fafa792222f056d04a3039b9ddbd0515d78e
Robert Greenwalt [Fri, 29 Jul 2016 02:33:03 +0000 (02:33 +0000)]
Add support to hide LTE+ in UI. am:
37d34ba893 am:
4dace686d9
am:
44709efc96
Change-Id: I54dd593bafc0757c759d24a15ff74ab8c2f77331
Julia Reynolds [Fri, 29 Jul 2016 02:30:16 +0000 (02:30 +0000)]
Merge \\\"Do less work on configuration change.\\\" into nyc-mr1-dev am:
aef7b7242e am:
c8a5f3770a
am:
ae12541cae
Change-Id: I169f911155e9d0e1ba8bd89fb5fd630515879149
Julia Reynolds [Fri, 29 Jul 2016 02:30:13 +0000 (02:30 +0000)]
Do less work on configuration change. am:
494f0dedb2 am:
333cda7967
am:
aaf3740f19
Change-Id: I75ab0148f20ab44ce8b4975696129f487c33aaba
Kevin Hufnagle [Fri, 29 Jul 2016 02:30:07 +0000 (02:30 +0000)]
Merge \\\\"docs: Relocated all intl versions of \\\\"Network Security Config\\\\"\\\\" into nyc-dev am:
7fc84dbd86 am:
c89c87a041 am:
74787efa5e
am:
93c53df0ea
Change-Id: I5f7ccf8be726ed496436d9033428c29592514dda
Kevin Hufnagle [Fri, 29 Jul 2016 02:30:00 +0000 (02:30 +0000)]
docs: Relocated all intl versions of \\\\"Network Security Config\\\\" am:
f2934fb9d7 am:
6aade81b0f am:
34f2d8949e
am:
2bfe1db245
Change-Id: I2b4d846930c62e95d37c15cd54d54149ba39eefb
Kevin Hufnagle [Fri, 29 Jul 2016 02:29:55 +0000 (02:29 +0000)]
Merge \\\"docs: Relocated all intl versions of \\\"Network Security Config\\\"\\\" into nyc-dev am:
7fc84dbd86 am:
c7470eae93
am:
75b68d7d28
Change-Id: I511cbc14655f0aace71814b20d1031758895aadb
Kevin Hufnagle [Fri, 29 Jul 2016 02:16:19 +0000 (02:16 +0000)]
docs: Relocated all intl versions of \\\"Network Security Config\\\" am:
f2934fb9d7 am:
2a136a5305
am:
796a6dd91a
Change-Id: I612f47201e91823a0dfcfc8fa4a0bff1a2967621
Makoto Onuki [Fri, 29 Jul 2016 02:16:13 +0000 (02:16 +0000)]
Merge \\\"Fix timeout in a test utility method\\\" into nyc-mr1-dev am:
648d3030a7 am:
024f0f7fe3
am:
0d1bab8b44
Change-Id: I5346792a70e8e75569dba52f4b950a05b011dfef
Makoto Onuki [Fri, 29 Jul 2016 02:16:09 +0000 (02:16 +0000)]
Fix timeout in a test utility method am:
a210ccfab7 am:
56542a3e1c
am:
8cfffbbad5
Change-Id: Icb6bed68551dcbc5195dac55e06a84960b39a292
Chris Banes [Fri, 29 Jul 2016 02:16:05 +0000 (02:16 +0000)]
Merge \\\"Fix CascadingMenuPopup width if background has padding DO NOT MERGE\\\" into nyc-mr1-dev am:
7f37f2693f am:
587b60b2ff
am:
94f5c526f6 -s ours
Change-Id: I0c43b3bc4d194ed451c0c317b48fca6d3b2b6f69
Chris Banes [Fri, 29 Jul 2016 02:16:01 +0000 (02:16 +0000)]
Fix CascadingMenuPopup width if background has padding DO NOT MERGE am:
f9e2c1b326 am:
be3daf6947
am:
19ce4ad1f6 -s ours
Change-Id: I54b3a18222bbc610d0063991bd48d69dcd0262f0
David Friedman [Fri, 29 Jul 2016 02:07:15 +0000 (02:07 +0000)]
Docs: Deleting the rest of the preview/ directory due to N Release migration am:
66a45479e0 am:
378183607b am:
45950fa31c
am:
74bd501bd7
Change-Id: I1a1f78cf499be0e768e4e62a4e8d07b24518f35a
David Friedman [Fri, 29 Jul 2016 02:07:12 +0000 (02:07 +0000)]
Docs: Deleting the rest of the preview/ directory due to N Release migration am:
66a45479e0 am:
98d26156a1
am:
0c34331727
Change-Id: Id77efce8d0ceee6bd51da68c556195f75ec241e2
David Friedman [Fri, 29 Jul 2016 02:07:09 +0000 (02:07 +0000)]
Docs: Migration of N docs to about/versions/ am:
f3851c1670 am:
35207b758e am:
c09ad9c70a
am:
9f68ffb787
Change-Id: I141eb90e927d0a8ad75b0485db065538c7e8e5e3
David Friedman [Fri, 29 Jul 2016 02:07:06 +0000 (02:07 +0000)]
Docs: Migration of N docs to about/versions/ am:
f3851c1670 am:
ce885e7312
am:
ff5e44035a
Change-Id: I7fd4408191685e01b564dfccf3b80027c84427fa
Dirk Dougherty [Fri, 29 Jul 2016 02:07:03 +0000 (02:07 +0000)]
Doc change: remove notifications guidelines page and redirect to material spec. am:
9bb0869926 am:
340a59c77b am:
98fe13a4aa
am:
18fe742ee0
Change-Id: Ibde14a21bea995d01a2ae0613fe76e03a5a18646
Andrew Solovay [Fri, 29 Jul 2016 02:04:23 +0000 (02:04 +0000)]
Merge \\\\"docs: Fixed bad link to cloud-backup training class\\\\" into nyc-docs am:
baa3c078a6 am:
3af211196d am:
7d4993d40a
am:
a944d9757a
Change-Id: If9d27dbc75239243d26c7d1ba83dc93d9912d03c
Andrew Solovay [Fri, 29 Jul 2016 02:04:21 +0000 (02:04 +0000)]
docs: Fixed bad link to cloud-backup training class am:
c02411f38d am:
7e7924b074 am:
23fa265d60
am:
b83f3f05b7
Change-Id: Id94aaca36c03b2f4846057f6301ba61ad6517ac8
Andrew Solovay [Fri, 29 Jul 2016 02:04:18 +0000 (02:04 +0000)]
Merge \\\\"docs: Removed reference to Android Support Library\\\\" into nyc-docs am:
2a550cfa2a am:
6a56b0579d am:
426ee58a86
am:
828ae050b4
Change-Id: I72a25a0da7056adfe36e1e9f1eecdb6dd389a563
Dirk Dougherty [Fri, 29 Jul 2016 02:04:15 +0000 (02:04 +0000)]
Doc change: remove notifications guidelines page and redirect to material spec. am:
9bb0869926 am:
340a59c77b am:
9574299cba am:
d4d1939357
am:
5af88d62e3
Change-Id: I852f605122b01c2b01fcbfe39b6b59e6b5ae02fe
Andrew Solovay [Fri, 29 Jul 2016 02:04:11 +0000 (02:04 +0000)]
Merge \\\\\"docs: Fixed bad link to cloud-backup training class\\\\\" into nyc-docs am:
baa3c078a6 am:
3af211196d am:
cc5bf6902b am:
64fd02c931
am:
f36c88690d
Change-Id: I3c0f540a838a0cec51487db89e60d0484de9c596
Andrew Solovay [Fri, 29 Jul 2016 02:01:41 +0000 (02:01 +0000)]
docs: Fixed bad link to cloud-backup training class am:
c02411f38d am:
7e7924b074 am:
a0f7338634 am:
0fb2ddcc2d
am:
f34f9f4e88
Change-Id: I7eb6730c33c1d252e0726a753c4cddaf9d34e0b2
Andrew Solovay [Fri, 29 Jul 2016 02:01:37 +0000 (02:01 +0000)]
Merge \\\\\"docs: Removed reference to Android Support Library\\\\\" into nyc-docs am:
2a550cfa2a am:
6a56b0579d am:
8fb893e96c am:
8f6e247913
am:
88d66ab512
Change-Id: I3cdcf5b1ce2cef332fbed2ab67f9b7977eb76ee0
Andrew Solovay [Fri, 29 Jul 2016 02:01:34 +0000 (02:01 +0000)]
Merge \\\\"docs: Moving localized versions of N Preview docs\\\\" into nyc-dev am:
a15c0c2902 am:
c9b1903d84 am:
e13ba26571
am:
ad9d82cb9e
Change-Id: I5107db916c57b29170205c296fef7d5bb8c07639
Andrew Solovay [Fri, 29 Jul 2016 02:01:32 +0000 (02:01 +0000)]
docs: Moving localized versions of N Preview docs am:
32845b1eb9 am:
7b0845fea6 am:
9371b0d8eb
am:
c803f978ea
Change-Id: I245983c8e7eccc4e2bc125b974c4a55ab076d831
Andrew Solovay [Fri, 29 Jul 2016 02:01:29 +0000 (02:01 +0000)]
Merge \\\\"resolve merge conflicts of
07fe016 to nyc-dev\\\\" into nyc-dev am:
ed49ee64f0 am:
52d5b382ee am:
f0ca1c16d7
am:
9eb9279039
Change-Id: I59a5cf7f45fcc27c3e74aca32ce39641408964d4
Andrew Solovay [Fri, 29 Jul 2016 01:59:00 +0000 (01:59 +0000)]
resolve merge conflicts of
07fe016 to nyc-dev am:
0f9a790e0f am:
19747cb135 am:
c03ee73ec2
am:
3f61437646
Change-Id: I6d2832773b741faa5c51f2a3a2e713991aed4bbf
Dan Yu [Fri, 29 Jul 2016 01:58:56 +0000 (01:58 +0000)]
Merge \\\\"docs: Moving L10N versions of Scoped Dir Access docs\\\\" into nyc-dev am:
2c77170adb am:
90a2ba89b1 am:
3d75f7fd97
am:
a7a1038b4e
Change-Id: I9ac1178971e4bba7fa6b0cd99e351c7b943172b7
Daniel Yu [Fri, 29 Jul 2016 01:58:53 +0000 (01:58 +0000)]
docs: Moving L10N versions of Scoped Dir Access docs am:
a4fc4209c8 am:
c4d1f7a35e am:
05fdf9b85c
am:
e8ff6f9cff
Change-Id: Ic8a30d972e89a3f7ed7fa1710ab00e1cf28f6ec6
Dan Yu [Fri, 29 Jul 2016 01:58:50 +0000 (01:58 +0000)]
Merge \\\\"docs: Moving L10N versions of TV recording API docs\\\\" into nyc-dev am:
ee7fa57ea6 am:
1f8b805f14 am:
1a286210d0
am:
6d32002122
Change-Id: I01c7c8ae8220d38601c5366310e87fb96ed9acb4
Daniel Yu [Fri, 29 Jul 2016 01:58:46 +0000 (01:58 +0000)]
docs: Moving L10N versions of TV recording API docs am:
a93eeaa38b am:
1e255933da am:
95af3c40fc
am:
aabb5d1a45
Change-Id: I0a4fca3c7fb24fa74b23588f729c453b49965029
Dan Yu [Fri, 29 Jul 2016 01:56:08 +0000 (01:56 +0000)]
Merge \\\\"docs: Moving L10N versions of Direct Boot docs\\\\" into nyc-dev am:
3744b05b0e am:
fa70537cd6 am:
1ae6dfc6ad
am:
4b679a6015
Change-Id: Ie6be994c6fcd09bfa5a1a569aaaf63d9de721805
Daniel Yu [Fri, 29 Jul 2016 01:56:05 +0000 (01:56 +0000)]
docs: Moving L10N versions of Direct Boot docs am:
9bd8e969da am:
6ee0a29bc8 am:
61db5264db
am:
0759bf9bbc
Change-Id: Ic1c9dcf106d9bcd3c0889caa117213dc035d68ac
Dan Yu [Fri, 29 Jul 2016 01:56:02 +0000 (01:56 +0000)]
Merge \\\\"docs: Moving L10N versions of PIP docs\\\\" into nyc-dev am:
1f33503861 am:
67da26112f am:
dc218c8fcb
am:
2991330ce0
Change-Id: I908ffef880efea527a0119dc954b8a45adc13fb7
Daniel Yu [Fri, 29 Jul 2016 01:55:59 +0000 (01:55 +0000)]
docs: Moving L10N versions of PIP docs am:
089055f18c am:
b3d4a4003a am:
82f3ec0d6e
am:
85cb2e2082
Change-Id: I5044805409edeb435efff10049f37cb9d3d0e5d4
Andrew Solovay [Fri, 29 Jul 2016 01:55:56 +0000 (01:55 +0000)]
Merge changes I17119726,Ia1ae819a into nyc-mr1-dev am:
56fc279b7d am:
7dcbf967fa
am:
b952d67008
Change-Id: Icb8ed057290348e4d5de608b1e10ed88003398d2
Andrew Solovay [Fri, 29 Jul 2016 01:53:23 +0000 (01:53 +0000)]
Merge \\\\"docs: Moving internationalized versions of multi-window doc\\\\" into nyc-dev am:
76f3cc7fc0 am:
1108b99e7c am:
0c97adde47
am:
05fcbf0ce6
Change-Id: Ib13fcffe63cc2fc588af8c841574a4a22690dcdc
Andrew Solovay [Fri, 29 Jul 2016 01:53:20 +0000 (01:53 +0000)]
docs: Moving internationalized versions of multi-window doc am:
82a38458e6 am:
8497d93f32 am:
101b9284cc
am:
89db368c79
Change-Id: Ice4e3b743c7001cd1971b20d7fd3adaff93cd8e0
Andrew Solovay [Fri, 29 Jul 2016 01:53:17 +0000 (01:53 +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
am:
f837d367c0
Change-Id: I16ce74403c8fcfb4888b909fa5eff7b95bc55d0c
Andrew Solovay [Fri, 29 Jul 2016 01:53:14 +0000 (01:53 +0000)]
docs: Moving multi-window docs out of N Preview area for N release am:
dda5e4b1ab am:
3bd12d8e8b am:
5a33e2172c
am:
066b450a33
Change-Id: I61fe6a757d70ff69e4af194e16c9e30fb384997c
Andrew Solovay [Fri, 29 Jul 2016 01:53:11 +0000 (01:53 +0000)]
Merge changes I67077905,Ibe3ae323 into nyc-mr1-dev am:
bc819e604f am:
c10534685a
am:
e745b5018a
Change-Id: Ic5406ea1ec43f7443efa5c0055c682a65f4f7fca
Andrew Solovay [Fri, 29 Jul 2016 01:50:24 +0000 (01:50 +0000)]
Merge \\\\"docs: Removing internationalized versions of AfW preview doc\\\\" into nyc-dev am:
40782b2415 am:
948bb428ae am:
e81a547e81
am:
41d134fe68
Change-Id: I00e053b447dda1acc03d5f1249126ac69aa4fe23
Andrew Solovay [Fri, 29 Jul 2016 01:50:22 +0000 (01:50 +0000)]
docs: Removing internationalized versions of AfW preview doc am:
d6d4de697e am:
74c7ef917f am:
b5804ff8fa
am:
6370ad8098
Change-Id: I1dba56187640fb2eba92adce9be8eccbcb0a80f6
Andrew Solovay [Fri, 29 Jul 2016 01:50:18 +0000 (01:50 +0000)]
Merge changes Ie43bcbcd,Ia9901a83 into nyc-mr1-dev am:
762dc30ad5 am:
30cb846c33
am:
d6e64b364a
Change-Id: Ie615397927ce2f13e98bdb952ada90407c073299
Andrew Solovay [Fri, 29 Jul 2016 01:50:13 +0000 (01:50 +0000)]
Merge \\\\"docs: Removing N Preview AfW doc, and setting up redirect\\\\" into nyc-dev am:
15e72ce64b am:
a3072a31c8 am:
48569cb18a
am:
2a5c2e2f5c
Change-Id: I7c0a9adc78c4d50758477ccb4af66fe670df41c2
Andrew Solovay [Fri, 29 Jul 2016 01:50:08 +0000 (01:50 +0000)]
docs: Removing N Preview AfW doc, and setting up redirect am:
09f5a77754 am:
a8f987a63d am:
dc63ac21d9
am:
11a584c8c0
Change-Id: I1d5cf529730f471c302e343e0498821586f45710
Android Build Merger (Role) [Fri, 29 Jul 2016 01:40:11 +0000 (01:40 +0000)]
Merge "Merge \\\\"docs: Added Android N (API level 24) to the \\\\"API levels\\\\" table\\\\" into nyc-dev am:
ffe63a4ad8 am:
89d4427097 am:
ba293d3488 am:
4e770e66d4"
Android Build Merger (Role) [Fri, 29 Jul 2016 01:40:00 +0000 (01:40 +0000)]
Merge "docs: Added Android N (API level 24) to the \\\\"API levels\\\\" table am:
563c4f1adb am:
bcfcb6d81c am:
8c1796e935 am:
1e445e60ba"
Android Build Merger (Role) [Fri, 29 Jul 2016 01:39:38 +0000 (01:39 +0000)]
Merge "Merge \\\"Turn off simplePath optimization then Path object is used as out param\\\" into nyc-mr1-dev am:
9b17ebca8f am:
a00a5326d4 am:
b901543315"
Android Build Merger (Role) [Fri, 29 Jul 2016 01:39:28 +0000 (01:39 +0000)]
Merge "Turn off simplePath optimization then Path object is used as out param am:
a6a8557d6e am:
2ef3bdbd7a am:
eeeacd77ee"
Android Build Merger (Role) [Fri, 29 Jul 2016 01:39:16 +0000 (01:39 +0000)]
Merge "Merge \\\"Keyguard: Reapply insets when fitsSystemWindow changes\\\" into nyc-mr1-dev am:
5e0a42848e am:
7c323ce7d7 am:
51fe9421ae"
Andrew Solovay [Fri, 29 Jul 2016 01:38:37 +0000 (01:38 +0000)]
Merge \\\\"docs: Added Android N (API level 24) to the \\\\"API levels\\\\" table\\\\" into nyc-dev am:
ffe63a4ad8 am:
89d4427097 am:
ba293d3488
am:
4e770e66d4
Change-Id: I592c362bec3cec38b9c4a04fc5eeb1c2d66b2b79
Andrew Solovay [Fri, 29 Jul 2016 01:38:30 +0000 (01:38 +0000)]
docs: Added Android N (API level 24) to the \\\\"API levels\\\\" table am:
563c4f1adb am:
bcfcb6d81c am:
8c1796e935
am:
1e445e60ba
Change-Id: I0a1dd5e39d96fb8b0b07e0c8b4638f4b7c94d8eb
sergeyv [Fri, 29 Jul 2016 01:38:25 +0000 (01:38 +0000)]
Merge \\\"Turn off simplePath optimization then Path object is used as out param\\\" into nyc-mr1-dev am:
9b17ebca8f am:
a00a5326d4
am:
b901543315
Change-Id: I978b3056cf5aa81a930a3ae36720e0c51fdc5df4
sergeyv [Fri, 29 Jul 2016 01:38:20 +0000 (01:38 +0000)]
Turn off simplePath optimization then Path object is used as out param am:
a6a8557d6e am:
2ef3bdbd7a
am:
eeeacd77ee
Change-Id: I3b6ce06f5ce241664b322512060581954201c1f7
Adrian Roos [Fri, 29 Jul 2016 01:38:15 +0000 (01:38 +0000)]
Merge \\\"Keyguard: Reapply insets when fitsSystemWindow changes\\\" into nyc-mr1-dev am:
5e0a42848e am:
7c323ce7d7
am:
51fe9421ae
Change-Id: Ia96e1c2c59e83d8d8472a8795fd5998d9f7fe3a2
Mitchell Wills [Fri, 29 Jul 2016 01:37:01 +0000 (01:37 +0000)]
Merge "Don't pull in external/junit through mockito"
Adrian Roos [Fri, 29 Jul 2016 01:29:42 +0000 (01:29 +0000)]
Merge \\\"Keyguard: Reapply insets when fitsSystemWindow changes\\\" into nyc-mr1-dev am:
5e0a42848e am:
7c323ce7d7
am:
01d9cf7e8b
Change-Id: Ib8fe57677de6edd5968509f445d5765141f459e0
Adrian Roos [Fri, 29 Jul 2016 01:29:36 +0000 (01:29 +0000)]
Keyguard: Reapply insets when fitsSystemWindow changes am:
a5d6cd0981 am:
cc0c27f9a9
am:
99ef6706ad
Change-Id: I61be6ae881a0d22a704baf6400c0ffd62cba3c7c
Andrew Solovay [Fri, 29 Jul 2016 01:29:32 +0000 (01:29 +0000)]
Merge \\\"docs: Moving localized versions of N Preview docs\\\" into nyc-dev am:
a15c0c2902 am:
c45e32cca2
am:
8ce49f1212
Change-Id: I8ac482e0e740767b20c05f89214ba3cdc8bf2f74
Andrew Solovay [Fri, 29 Jul 2016 01:29:29 +0000 (01:29 +0000)]
docs: Moving localized versions of N Preview docs am:
32845b1eb9 am:
bf5981d319
am:
840f20c961
Change-Id: I9b7f37e8ca614c398708afe9b55f3ea86f9a46c2
Andrew Solovay [Fri, 29 Jul 2016 01:29:26 +0000 (01:29 +0000)]
Merge \\\"resolve merge conflicts of
07fe016 to nyc-dev\\\" into nyc-dev am:
ed49ee64f0 am:
64e4e6e549
am:
abf291b0c8
Change-Id: I3052fe4901363cc3a7a72ba316b352783eb3414f
Andrew Solovay [Fri, 29 Jul 2016 01:26:42 +0000 (01:26 +0000)]
resolve merge conflicts of
07fe016 to nyc-dev am:
0f9a790e0f am:
238ea71c51
am:
e209f0ea56
Change-Id: I63db2da80029fe14ae81660e7ba80c28104bf242
Daniel Yu [Fri, 29 Jul 2016 01:26:37 +0000 (01:26 +0000)]
Merge \\\"docs: Moving L10N versions of Scoped Dir Access docs\\\" into nyc-dev am:
2c77170adb am:
3c733da11e
am:
6dcdd1de64
Change-Id: Ic17d84c38c3b294c7bd1fb6cfc9380608dec5fb7
Daniel Yu [Fri, 29 Jul 2016 01:26:33 +0000 (01:26 +0000)]
docs: Moving L10N versions of Scoped Dir Access docs am:
a4fc4209c8 am:
9079210b36
am:
83e66f218a
Change-Id: If18e1e8f8d29b30725db6ed51044d8ee511e9d8f
Daniel Yu [Fri, 29 Jul 2016 01:26:30 +0000 (01:26 +0000)]
Merge \\\"docs: Moving L10N versions of TV recording API docs\\\" into nyc-dev am:
ee7fa57ea6 am:
6569cc9b93
am:
6a93bfcebd
Change-Id: I49822803de27dfc90d1d5a5f4927150e47c6ac51
Daniel Yu [Fri, 29 Jul 2016 01:26:26 +0000 (01:26 +0000)]
docs: Moving L10N versions of TV recording API docs am:
a93eeaa38b am:
63470f763a
am:
a36b3e62dd
Change-Id: I962a0c9f8b477fad207fc981d57df82788839ac2
Daniel Yu [Fri, 29 Jul 2016 01:23:40 +0000 (01:23 +0000)]
Merge \\\"docs: Moving L10N versions of Direct Boot docs\\\" into nyc-dev am:
3744b05b0e am:
c14527f2cd
am:
faa71400bc
Change-Id: Icc0da15c7b7a9bbb35b54d1782501d51ca3b0660
Daniel Yu [Fri, 29 Jul 2016 01:23:37 +0000 (01:23 +0000)]
docs: Moving L10N versions of Direct Boot docs am:
9bd8e969da am:
48e4ccc396
am:
30f11d7757
Change-Id: Ia3c083902b7cffa3c2fac29789ee6e20c856f35f
Jeff Sharkey [Fri, 29 Jul 2016 01:23:34 +0000 (01:23 +0000)]
Merge \"Merge \\\"Polish around locked user communication.\\\" into nyc-mr1-dev am:
9882960460 am:
f624e7aefb\" into nyc-mr1-dev-plus-aosp
am:
7fef265268
Change-Id: I3a3246bbc2dde958a8e8ddbcc713612236aeedb0
Jeff Sharkey [Fri, 29 Jul 2016 01:23:31 +0000 (01:23 +0000)]
Merge \\\"Polish around locked user communication.\\\" into nyc-mr1-dev am:
9882960460 am:
f624e7aefb
am:
09065bf62a
Change-Id: I5cf045c8b3e9c11c4e5e98c2ca777f4e7e275f25
Jeff Sharkey [Fri, 29 Jul 2016 01:23:25 +0000 (01:23 +0000)]
Merge \"Polish around locked user communication. am:
b6edaa952e am:
9a0e0021a4\" into nyc-mr1-dev-plus-aosp
am:
1c8b59c80a
Change-Id: Ica48af9081bb817685dae0f8a7b111f5e28d4552
Jeff Sharkey [Fri, 29 Jul 2016 01:23:22 +0000 (01:23 +0000)]
Polish around locked user communication. am:
b6edaa952e am:
9a0e0021a4
am:
7c261c4a79
Change-Id: If7bd5d7902b48212ecbb9d3899b9872a3dc1fa2d
Adrian Roos [Fri, 29 Jul 2016 01:23:15 +0000 (01:23 +0000)]
Merge \"Merge \\\"Allow restarting foreground services once\\\" into nyc-mr1-dev am:
6a1dcb635f am:
378c455ec2\" into nyc-mr1-dev-plus-aosp
am:
6bffe2e7be
Change-Id: I43154e47d02fff5e08ee188ed082d19ed3e8edb8
Adrian Roos [Fri, 29 Jul 2016 01:23:12 +0000 (01:23 +0000)]
Merge \\\"Allow restarting foreground services once\\\" into nyc-mr1-dev am:
6a1dcb635f am:
378c455ec2
am:
8a2b419290
Change-Id: Icbe514ce745abe11f02f3f6c52a9c574d04fb07e
Adrian Roos [Fri, 29 Jul 2016 01:19:16 +0000 (01:19 +0000)]
Merge \"Allow restarting foreground services once am:
805ea307e7 am:
d64259954f\" into nyc-mr1-dev-plus-aosp
am:
fbea3500cc
Change-Id: Ie5fedcd367c71e101f8e32d1613ad5952d892845
Adrian Roos [Fri, 29 Jul 2016 01:19:13 +0000 (01:19 +0000)]
Allow restarting foreground services once am:
805ea307e7 am:
d64259954f
am:
1c40a9dc7e
Change-Id: I81eab50ce000c890c56e3aeb24031098b7e12c9b
Dan Yu [Fri, 29 Jul 2016 01:19:06 +0000 (01:19 +0000)]
Merge \"Merge \\\"docs: Moving L10N versions of PIP docs\\\" into nyc-dev am:
1f33503861 am:
f7c9eec3fd\" into nyc-mr1-dev-plus-aosp
am:
f71fdd2845
Change-Id: I57ce84c83e00b72da0cd5f2091ee585e2a570ce3
Daniel Yu [Fri, 29 Jul 2016 01:19:03 +0000 (01:19 +0000)]
Merge \\\"docs: Moving L10N versions of PIP docs\\\" into nyc-dev am:
1f33503861 am:
f7c9eec3fd
am:
ddd43e20c0
Change-Id: I42dab824a8b6f3feeb5cd9638bb3bbc8550ac60c
Adarsh Fernando [Fri, 29 Jul 2016 01:18:55 +0000 (01:18 +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
am:
391cb506d2
Change-Id: I879e5114d364613379319b23ee7df324e86334d1
Adarsh Fernando [Fri, 29 Jul 2016 01:18:52 +0000 (01:18 +0000)]
Merge \\\"Docs: Migrating platform docs to /guide/platform/ with new landing page am:
cf150dd245\\\" into nyc-mr1-dev am:
b034410564 am:
f90bbe7586
am:
e924dfc77b
Change-Id: I938172d8a7e3c6b49611669a9264b9b92f143a5c
Daniel Yu [Fri, 29 Jul 2016 01:18:45 +0000 (01:18 +0000)]
Merge \"docs: Moving L10N versions of PIP docs am:
089055f18c am:
e6772cc642\" into nyc-mr1-dev-plus-aosp
am:
7c4205ec6e
Change-Id: I19105bbe10122024c6e41b6630d3f22205ac2f78
Daniel Yu [Fri, 29 Jul 2016 01:18:42 +0000 (01:18 +0000)]
docs: Moving L10N versions of PIP docs am:
089055f18c am:
e6772cc642
am:
97fb9d490f
Change-Id: Ica8fc0d33dbc6b668b0073d11551609332de5d8d
Adarsh Fernando [Fri, 29 Jul 2016 01:18:33 +0000 (01:18 +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
am:
fe4b8b8bea
Change-Id: Ifaa429501c9c0c12b5949d29637c5ecdb9da64f9
Adarsh Fernando [Fri, 29 Jul 2016 01:18:30 +0000 (01:18 +0000)]
Docs: Migrating platform docs to /guide/platform/ with new landing page am:
cf150dd245 am:
5ffeb645fe am:
71b6e0012b
am:
cf020ba029
Change-Id: I97296e893585cc6455c8a093894bdac85e4e6758
Andrew Solovay [Fri, 29 Jul 2016 01:15:14 +0000 (01:15 +0000)]
Merge \"Merge \\\"docs: Moving internationalized versions of multi-window doc\\\" into nyc-dev am:
76f3cc7fc0 am:
6ecad9689b\" into nyc-mr1-dev-plus-aosp
am:
a0dbc185ba
Change-Id: Iaf959d4a5138f786bbb433527b91ae6a60c0d1a1
Andrew Solovay [Fri, 29 Jul 2016 01:15:10 +0000 (01:15 +0000)]
Merge \\\"docs: Moving internationalized versions of multi-window doc\\\" into nyc-dev am:
76f3cc7fc0 am:
6ecad9689b
am:
01dcaddddc
Change-Id: Ieda66b65bc0f05880f43a993e5edc8f2cf20fb28
OSDN Git Service
