OSDN Git Service
Android Build Merger (Role) [Tue, 14 Jun 2016 15:27:35 +0000 (15:27 +0000)]
Merge "Merge \\\\"Docs: Watch face performance update\\\\" into mnc-io-docs am:
99677fb42d am:
106af82850 am:
22eb26c27d am:
f6facbe16f" into nyc-mr1-dev-plus-aosp
Bert McMeen [Tue, 14 Jun 2016 15:27:03 +0000 (15:27 +0000)]
Merge \\\\"Docs: Watch face performance update\\\\" into mnc-io-docs am:
99677fb42d am:
106af82850 am:
22eb26c27d
am:
f6facbe16f
Change-Id: Ie574869110ed3af94c5058c0a11556087f9851c1
Bert McMeen [Tue, 14 Jun 2016 15:26:59 +0000 (15:26 +0000)]
Merge \\\\"Docs: Watch face performance update\\\\" into mnc-io-docs am:
99677fb42d am:
106af82850 am:
22eb26c27d
am:
8e0ead3128
Change-Id: I4350d426a0119cd1c6e97b11aaa9933b7954edf6
Bert McMeen [Tue, 14 Jun 2016 15:21:59 +0000 (15:21 +0000)]
Merge \\\"Docs: Watch face performance update\\\" into mnc-io-docs am:
99677fb42d am:
106af82850
am:
22eb26c27d
Change-Id: If7a2cf955301438736cb3097aadc7b0b08308a07
Bert McMeen [Tue, 14 Jun 2016 15:21:58 +0000 (15:21 +0000)]
Merge \\\"Docs: Watch face performance update\\\" into mnc-io-docs am:
99677fb42d am:
106af82850
am:
22eb26c27d
Change-Id: Ifd3b004c5401ba7374d642439938849da19060e8
Bert McMeen [Tue, 14 Jun 2016 15:15:59 +0000 (15:15 +0000)]
Merge \\"Docs: Watch face performance update\\" into mnc-io-docs am:
99677fb42d
am:
106af82850
Change-Id: Ia9fa224a4ebb6e51a3c6141751036504d202e137
Bert McMeen [Tue, 14 Jun 2016 15:07:53 +0000 (15:07 +0000)]
Merge \"Docs: Watch face performance update\" into mnc-io-docs
am:
99677fb42d
Change-Id: I41b6ee0628e561cfb7f711d07ac1e41ff71fcb60
Bert McMeen [Tue, 14 Jun 2016 15:01:59 +0000 (15:01 +0000)]
Merge "Docs: Watch face performance update" into mnc-io-docs
Android Build Merger (Role) [Tue, 14 Jun 2016 14:59:23 +0000 (14:59 +0000)]
Merge "Merge \\"Redraw if dirty during stopped when resumed\\" into nyc-dev am:
5b4ff21a74 am:
f22f6cf0f3" into nyc-mr1-dev-plus-aosp
John Reck [Tue, 14 Jun 2016 14:58:56 +0000 (14:58 +0000)]
Merge \\"Redraw if dirty during stopped when resumed\\" into nyc-dev am:
5b4ff21a74
am:
fc4c59a10c
Change-Id: Id572ab8137655b8f64e563d78897d2461442dd39
John Reck [Tue, 14 Jun 2016 14:58:54 +0000 (14:58 +0000)]
Merge \\"Redraw if dirty during stopped when resumed\\" into nyc-dev am:
5b4ff21a74
am:
f22f6cf0f3
Change-Id: I45c27d4c2ae42b07b56231583f070740608f786a
John Reck [Tue, 14 Jun 2016 14:54:21 +0000 (14:54 +0000)]
Merge \"Redraw if dirty during stopped when resumed\" into nyc-dev
am:
5b4ff21a74
Change-Id: I75235a18c29939b4f221c8af664d5f7218660aed
John Reck [Tue, 14 Jun 2016 14:54:18 +0000 (14:54 +0000)]
Merge \"Redraw if dirty during stopped when resumed\" into nyc-dev
am:
5b4ff21a74
Change-Id: If4eedb4a4c1ff6d4e96f8b0db4ddd846a2967a9f
John Reck [Tue, 14 Jun 2016 14:43:19 +0000 (14:43 +0000)]
Merge "Redraw if dirty during stopped when resumed" into nyc-dev
Bill Yi [Tue, 14 Jun 2016 12:36:18 +0000 (12:36 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
7ce75172dd -s ours
am:
31e9b4c8c7 -s ours
Change-Id: If391bdaadf13a3050e400f41cc7317113587fc16
Bill Yi [Tue, 14 Jun 2016 12:27:51 +0000 (12:27 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
7ce75172dd -s ours
am:
933d21c9ea -s ours
Change-Id: Ic46f9f9b3a2787372c4d745b1346e2b364fb1443
Android Build Merger (Role) [Tue, 14 Jun 2016 12:21:47 +0000 (12:21 +0000)]
Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
bb8b32262f -s ours am:
960a0a8fec -s ours" into nyc-mr1-dev-plus-aosp
Bill Yi [Tue, 14 Jun 2016 12:21:19 +0000 (12:21 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
7ce75172dd -s ours
Change-Id: Ie8451e38f89fedd49445ff91b1d01fe93177292b
Bill Yi [Tue, 14 Jun 2016 12:21:19 +0000 (12:21 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
7ce75172dd -s ours
Change-Id: I274fab0d3c27f19b7cf98e30f0c068a12df716a7
Bill Yi [Tue, 14 Jun 2016 12:21:19 +0000 (12:21 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
bb8b32262f -s ours
am:
960a0a8fec -s ours
Change-Id: Ic70bed6bffbf93f59ef07230533abd19299cab88
Bill Yi [Tue, 14 Jun 2016 12:20:22 +0000 (12:20 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
bb8b32262f -s ours
am:
2ff4926362 -s ours
Change-Id: Ie6d4c29fa7c4b15a4020343f5ce0b1db6dd94405
Bill Yi [Tue, 14 Jun 2016 12:07:27 +0000 (12:07 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
7c1a615cf4 -s ours
Change-Id: I9055e8b99523a930a3495d252e37ab23813b5e24
Bill Yi [Tue, 14 Jun 2016 12:06:34 +0000 (12:06 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
bb8b32262f -s ours
Change-Id: I711e22ef0d10409d81c1ed4352876697797b95a8
Bill Yi [Tue, 14 Jun 2016 12:06:33 +0000 (12:06 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
bb8b32262f -s ours
Change-Id: Ie868e30032e9dc633bd2205413704d30801fd815
Bill Yi [Tue, 14 Jun 2016 12:06:33 +0000 (12:06 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
372e0ca91d -s ours
Change-Id: I848d0de6cc6b6bcbbbb9643900b3c29df7576fa1
TreeHugger Robot [Tue, 14 Jun 2016 11:47:53 +0000 (11:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 14 Jun 2016 11:46:58 +0000 (11:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 14 Jun 2016 11:46:42 +0000 (11:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 14 Jun 2016 11:46:23 +0000 (11:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Paul Jensen [Tue, 14 Jun 2016 11:24:57 +0000 (11:24 +0000)]
Merge \\"Show sign-in to network notification to all users, not just owner.\\" into nyc-dev am:
78452db285
am:
a73132f89d
Change-Id: Iead63295514f72cd588259f82ac44c98c54ac883
Paul Jensen [Tue, 14 Jun 2016 11:21:12 +0000 (11:21 +0000)]
Merge \\"Show sign-in to network notification to all users, not just owner.\\" into nyc-dev am:
78452db285
am:
1339a63248
Change-Id: I82726a61541da890dea12448b2823f3dd7e367d2
Paul Jensen [Tue, 14 Jun 2016 11:16:15 +0000 (11:16 +0000)]
Merge \"Show sign-in to network notification to all users, not just owner.\" into nyc-dev
am:
78452db285
Change-Id: Ic8f99cb7c7fa7ed1f40c73342840f82c56f9f90f
Paul Jensen [Tue, 14 Jun 2016 11:16:12 +0000 (11:16 +0000)]
Merge \"Show sign-in to network notification to all users, not just owner.\" into nyc-dev
am:
78452db285
Change-Id: I4522f765c6166bd1c8216088b1605eac4c69d869
Paul Jensen [Tue, 14 Jun 2016 11:05:31 +0000 (11:05 +0000)]
Merge "Show sign-in to network notification to all users, not just owner." into nyc-dev
Bill Yi [Tue, 14 Jun 2016 06:41:02 +0000 (23:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia4719090589aaee67824a31eebfecfc5bc43ce81
Auto-generated-cl: translation import
Bill Yi [Tue, 14 Jun 2016 06:26:51 +0000 (23:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4aafe42447a82d42a1b3c013f046a4a264dafcc4
Auto-generated-cl: translation import
Bill Yi [Tue, 14 Jun 2016 06:19:33 +0000 (23:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I038e3f98dc7d9fa52fdfd5c5cf2240214e52edc6
Auto-generated-cl: translation import
Bill Yi [Tue, 14 Jun 2016 05:58:21 +0000 (22:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ied2403cbd3d46b70771f137bd4b5aab6fb7150b5
Auto-generated-cl: translation import
Android Build Merger (Role) [Tue, 14 Jun 2016 04:35:16 +0000 (04:35 +0000)]
Merge "Merge \\"Make CotentResolver#openInputStream handle errors from reliable pipes.\\" into nyc-dev am:
ac3fe8fffe am:
499ab43ce3" into nyc-mr1-dev-plus-aosp
Tomasz Mikolajewski [Tue, 14 Jun 2016 04:34:54 +0000 (04:34 +0000)]
Merge \\"Make CotentResolver#openInputStream handle errors from reliable pipes.\\" into nyc-dev am:
ac3fe8fffe
am:
499ab43ce3
Change-Id: Ifc333646610580363acf8432eb25a78aa876fc25
Tomasz Mikolajewski [Tue, 14 Jun 2016 04:34:50 +0000 (04:34 +0000)]
Merge \\"Make CotentResolver#openInputStream handle errors from reliable pipes.\\" into nyc-dev am:
ac3fe8fffe
am:
be6e44cdfa
Change-Id: I0dc45cd8cb5c3e824edf56b4229c7dd752f77371
Tomasz Mikolajewski [Tue, 14 Jun 2016 04:24:44 +0000 (04:24 +0000)]
Merge \"Make CotentResolver#openInputStream handle errors from reliable pipes.\" into nyc-dev
am:
ac3fe8fffe
Change-Id: Ia2caacf5d322b807d29f51bde10b7866023b5de1
Tomasz Mikolajewski [Tue, 14 Jun 2016 04:24:39 +0000 (04:24 +0000)]
Merge \"Make CotentResolver#openInputStream handle errors from reliable pipes.\" into nyc-dev
am:
ac3fe8fffe
Change-Id: Ib09cea9ca5c6bb18dc16ffac70f23fa4b3ffd974
Tomasz Mikolajewski [Tue, 14 Jun 2016 04:15:25 +0000 (04:15 +0000)]
Merge "Make CotentResolver#openInputStream handle errors from reliable pipes." into nyc-dev
Android Build Merger (Role) [Tue, 14 Jun 2016 03:09:46 +0000 (03:09 +0000)]
Merge "Merge \\"docs: Expanded description of \\"Key Attestation\\" N Preview feature.\\" into nyc-dev am:
f6250cc7df am:
697b44a552" into nyc-mr1-dev-plus-aosp
Kevin Hufnagle [Tue, 14 Jun 2016 03:09:22 +0000 (03:09 +0000)]
Merge \\"docs: Expanded description of \\"Key Attestation\\" N Preview feature.\\" into nyc-dev am:
f6250cc7df
am:
697b44a552
Change-Id: I3de21938f2af536fbfacea48a4710bc0de520d88
Kevin Hufnagle [Tue, 14 Jun 2016 03:09:07 +0000 (03:09 +0000)]
Merge \\"docs: Expanded description of \\"Key Attestation\\" N Preview feature.\\" into nyc-dev am:
f6250cc7df
am:
ec9470fb55
Change-Id: Icbe8c8f2f6c61fcbce3095a9f4bdd5f7c7ee1a09
Kevin Hufnagle [Tue, 14 Jun 2016 03:04:40 +0000 (03:04 +0000)]
Merge \"docs: Expanded description of \"Key Attestation\" N Preview feature.\" into nyc-dev
am:
f6250cc7df
Change-Id: Iaa6ddf4ca95d0780c5b5d306680d56126ac6c0b5
Kevin Hufnagle [Tue, 14 Jun 2016 03:04:33 +0000 (03:04 +0000)]
Merge \"docs: Expanded description of \"Key Attestation\" N Preview feature.\" into nyc-dev
am:
f6250cc7df
Change-Id: Ic5623e1cf811e7a668bb9420d8522b610fe320ff
Kevin Hufnagle [Tue, 14 Jun 2016 02:53:29 +0000 (02:53 +0000)]
Merge "docs: Expanded description of "Key Attestation" N Preview feature." into nyc-dev
Chris Thornton [Tue, 14 Jun 2016 01:44:11 +0000 (01:44 +0000)]
Merge \"Store the vendor UUID of a KeyphraseSoundModel in the database\" into nyc-mr1-dev
am:
ab0783b5d0
Change-Id: I7d1f4556e7a21869f0c1a55a4c5765d66b4763ea
Chris Thornton [Tue, 14 Jun 2016 01:37:40 +0000 (01:37 +0000)]
Merge "Store the vendor UUID of a KeyphraseSoundModel in the database" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 14 Jun 2016 01:34:44 +0000 (01:34 +0000)]
Merge "Merge \\"docs: Add Videos section to N Preview landing page\\" into nyc-dev am:
e335ccdc00 am:
4b3350877b" into nyc-mr1-dev-plus-aosp
Joe Fernandez [Tue, 14 Jun 2016 01:34:21 +0000 (01:34 +0000)]
Merge \\"docs: Add Videos section to N Preview landing page\\" into nyc-dev am:
e335ccdc00
am:
4b3350877b
Change-Id: Ib0fa36c04749fddae13e187b2b8df5cdce3bd140
Joe Fernandez [Tue, 14 Jun 2016 01:33:39 +0000 (01:33 +0000)]
Merge \\"docs: Add Videos section to N Preview landing page\\" into nyc-dev am:
e335ccdc00
am:
75e0c4d1a3
Change-Id: I45be8cf3531fe665519c3d7615254013cd7fb8b2
Android Build Merger (Role) [Tue, 14 Jun 2016 01:26:57 +0000 (01:26 +0000)]
Merge "Merge \\\\"Fix a spelling error in Supporting Languages page.\\\\" into mnc-io-docs am:
ab239a0c1a am:
5699312627 am:
a53fc1f2c0 am:
5bdd762928" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 14 Jun 2016 01:26:45 +0000 (01:26 +0000)]
Merge "Merge \\\\"Swap fill_parent with match_parent in best practices doc.\\\\" into mnc-io-docs am:
df4528fbe8 am:
1729c75f73 am:
8bf5f6c851 am:
18fdb53359" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 14 Jun 2016 01:26:35 +0000 (01:26 +0000)]
Merge "Merge \\\\"Fix a spelling error in Supporting Languages page.\\\\" into mnc-io-docs am:
ab239a0c1a am:
5699312627 am:
a53fc1f2c0 am:
b49ec71fa9" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 14 Jun 2016 01:26:30 +0000 (01:26 +0000)]
Merge "Merge \\\\"Correct parentActivity example in Activity Element docs.\\\\" into mnc-io-docs am:
893413e50c am:
ce2e9d8716 am:
3f1741a19c am:
0ea3ffd6c1" into nyc-mr1-dev-plus-aosp
Aurimas Liutikas [Tue, 14 Jun 2016 01:25:52 +0000 (01:25 +0000)]
Merge \\\\"Fix a spelling error in Supporting Languages page.\\\\" into mnc-io-docs am:
ab239a0c1a am:
5699312627 am:
a53fc1f2c0
am:
5bdd762928
Change-Id: I741cc60486eb23babc8e58248dddba443b897045
Aurimas Liutikas [Tue, 14 Jun 2016 01:25:48 +0000 (01:25 +0000)]
Merge \\\\"Swap fill_parent with match_parent in best practices doc.\\\\" into mnc-io-docs am:
df4528fbe8 am:
1729c75f73 am:
8bf5f6c851
am:
18fdb53359
Change-Id: Ifcb3a427bec33c35888f186eb1b5b081988222c6
Aurimas Liutikas [Tue, 14 Jun 2016 01:25:45 +0000 (01:25 +0000)]
Merge \\\\"Correct parentActivity example in Activity Element docs.\\\\" into mnc-io-docs am:
893413e50c am:
ce2e9d8716 am:
3f1741a19c
am:
0ea3ffd6c1
Change-Id: I71758f9d738a46c879aa936d6b02390ed9089c6f
Joe Fernandez [Tue, 14 Jun 2016 01:25:44 +0000 (01:25 +0000)]
Merge \"docs: Add Videos section to N Preview landing page\" into nyc-dev
am:
e335ccdc00
Change-Id: I84dd9b79392333bac2dbd1a7ce947c2c044485b2
Aurimas Liutikas [Tue, 14 Jun 2016 01:25:38 +0000 (01:25 +0000)]
Merge \\\\"Fix a spelling error in Supporting Languages page.\\\\" into mnc-io-docs am:
ab239a0c1a am:
5699312627 am:
a53fc1f2c0
am:
b49ec71fa9
Change-Id: Ia341ef80c355d772b6748e1e3518d7fbd7ad0840
Aurimas Liutikas [Tue, 14 Jun 2016 01:25:32 +0000 (01:25 +0000)]
Merge \\\\"Swap fill_parent with match_parent in best practices doc.\\\\" into mnc-io-docs am:
df4528fbe8 am:
1729c75f73 am:
8bf5f6c851
am:
b9d6b4e5ca
Change-Id: I022f2ee907384b71980f9639c19408cf965ddf4e
Aurimas Liutikas [Tue, 14 Jun 2016 01:25:23 +0000 (01:25 +0000)]
Merge \\\\"Correct parentActivity example in Activity Element docs.\\\\" into mnc-io-docs am:
893413e50c am:
ce2e9d8716 am:
3f1741a19c
am:
a6513dad1b
Change-Id: Ia272ca12ba69f5bfd787757bf1177b9301ca1f65
Joe Fernandez [Tue, 14 Jun 2016 01:25:20 +0000 (01:25 +0000)]
Merge \"docs: Add Videos section to N Preview landing page\" into nyc-dev
am:
e335ccdc00
Change-Id: Ieb7e459071a5cfb4ddc7f6ae13c93628d2295456
Aurimas Liutikas [Tue, 14 Jun 2016 01:17:03 +0000 (01:17 +0000)]
Merge \\\"Fix a spelling error in Supporting Languages page.\\\" into mnc-io-docs am:
ab239a0c1a am:
5699312627
am:
a53fc1f2c0
Change-Id: I7e242b90394992b6f48eb738351f8f016d5e94cb
Aurimas Liutikas [Tue, 14 Jun 2016 01:16:58 +0000 (01:16 +0000)]
Merge \\\"Swap fill_parent with match_parent in best practices doc.\\\" into mnc-io-docs am:
df4528fbe8 am:
1729c75f73
am:
8bf5f6c851
Change-Id: I361068cabbea494480fc20e176a5335d653ee1d6
Aurimas Liutikas [Tue, 14 Jun 2016 01:16:53 +0000 (01:16 +0000)]
Merge \\\"Correct parentActivity example in Activity Element docs.\\\" into mnc-io-docs am:
893413e50c am:
ce2e9d8716
am:
3f1741a19c
Change-Id: Ib7ecbfec74f43726fdd1c0b935d995c3f57f613d
Joe Fernandez [Tue, 14 Jun 2016 01:13:25 +0000 (01:13 +0000)]
Merge "docs: Add Videos section to N Preview landing page" into nyc-dev
Joe Fernandez [Mon, 13 Jun 2016 17:11:13 +0000 (10:11 -0700)]
docs: Add Videos section to N Preview landing page
b/
29215717
Change-Id: I0bcd995a0a458e7624d1e8a689cb3eb249f9397d
Aurimas Liutikas [Tue, 14 Jun 2016 01:08:29 +0000 (01:08 +0000)]
Merge \\\"Fix a spelling error in Supporting Languages page.\\\" into mnc-io-docs am:
ab239a0c1a am:
5699312627
am:
a53fc1f2c0
Change-Id: I48d80c227fc5cfb37c283e1152fea4068568581f
Aurimas Liutikas [Tue, 14 Jun 2016 01:08:27 +0000 (01:08 +0000)]
Merge \\\"Swap fill_parent with match_parent in best practices doc.\\\" into mnc-io-docs am:
df4528fbe8 am:
1729c75f73
am:
8bf5f6c851
Change-Id: I04cee25a3584cfb97753bcf5d8afcde525c57999
Aurimas Liutikas [Tue, 14 Jun 2016 01:08:22 +0000 (01:08 +0000)]
Merge \\\"Correct parentActivity example in Activity Element docs.\\\" into mnc-io-docs am:
893413e50c am:
ce2e9d8716
am:
3f1741a19c
Change-Id: I0dd154fa1d66744136fe646a338387b004f7b827
Android Build Merger (Role) [Tue, 14 Jun 2016 00:58:00 +0000 (00:58 +0000)]
Merge "Merge \\"Use NoPreloadHolder for certificate sources\\" into nyc-dev am:
c738e48ed6 am:
193efc8bd0" into nyc-mr1-dev-plus-aosp
Aurimas Liutikas [Tue, 14 Jun 2016 00:57:28 +0000 (00:57 +0000)]
Merge \\"Fix a spelling error in Supporting Languages page.\\" into mnc-io-docs am:
ab239a0c1a
am:
5699312627
Change-Id: I7e7e4777b0475a7c2dd242370a6900cfd4457f90
Aurimas Liutikas [Tue, 14 Jun 2016 00:57:24 +0000 (00:57 +0000)]
Merge \\"Swap fill_parent with match_parent in best practices doc.\\" into mnc-io-docs am:
df4528fbe8
am:
1729c75f73
Change-Id: I074f24ee54e2ec7005e31a6528f54068c6e1eb3c
Chad Brubaker [Tue, 14 Jun 2016 00:57:21 +0000 (00:57 +0000)]
Merge \\"Use NoPreloadHolder for certificate sources\\" into nyc-dev am:
c738e48ed6
am:
193efc8bd0
Change-Id: Ic747a3682d26d285b69ab0bc3677f349ae32a083
Aurimas Liutikas [Tue, 14 Jun 2016 00:57:18 +0000 (00:57 +0000)]
Merge \\"Correct parentActivity example in Activity Element docs.\\" into mnc-io-docs am:
893413e50c
am:
ce2e9d8716
Change-Id: I90462329a4fbdd264714c653b0df30cbc9f4f866
Chad Brubaker [Tue, 14 Jun 2016 00:57:03 +0000 (00:57 +0000)]
Merge \\"Use NoPreloadHolder for certificate sources\\" into nyc-dev am:
c738e48ed6
am:
66bd9229dd
Change-Id: I2eed24b14da4c2b6df4bc766aaf86fb08100cd90
Chad Brubaker [Tue, 14 Jun 2016 00:49:25 +0000 (00:49 +0000)]
Merge \"Use NoPreloadHolder for certificate sources\" into nyc-dev
am:
c738e48ed6
Change-Id: Iae1170534a10b81778e9e1cd3df8e5fca62f7546
Aurimas Liutikas [Tue, 14 Jun 2016 00:48:55 +0000 (00:48 +0000)]
Merge \"Fix a spelling error in Supporting Languages page.\" into mnc-io-docs
am:
ab239a0c1a
Change-Id: I2de3485349f22c1eae990808c81320c8a995430d
Aurimas Liutikas [Tue, 14 Jun 2016 00:48:50 +0000 (00:48 +0000)]
Merge \"Swap fill_parent with match_parent in best practices doc.\" into mnc-io-docs
am:
df4528fbe8
Change-Id: Ie2039cf96c3591b6fc2c0cb8ec1097707edcc76b
Aurimas Liutikas [Tue, 14 Jun 2016 00:48:43 +0000 (00:48 +0000)]
Merge \"Correct parentActivity example in Activity Element docs.\" into mnc-io-docs
am:
893413e50c
Change-Id: I845619909443f9d56bfc7d9f5284b15c2587c5d6
Chad Brubaker [Tue, 14 Jun 2016 00:47:21 +0000 (00:47 +0000)]
Merge \"Use NoPreloadHolder for certificate sources\" into nyc-dev
am:
c738e48ed6
Change-Id: Iaf9a202979335c18b2c55c27530ef84e129ccf76
Yohei Yukawa [Tue, 14 Jun 2016 00:38:47 +0000 (00:38 +0000)]
Merge \"Add InputConnection#insertContent().\" into nyc-mr1-dev
am:
03f759e87e
Change-Id: I7ed048eb980a5b6fa5379756cf4679710c8ce358
TreeHugger Robot [Tue, 14 Jun 2016 00:35:48 +0000 (00:35 +0000)]
Merge "Use NoPreloadHolder for certificate sources" into nyc-dev
Aurimas Liutikas [Tue, 14 Jun 2016 00:33:52 +0000 (00:33 +0000)]
Merge "Fix a spelling error in Supporting Languages page." into mnc-io-docs
Aurimas Liutikas [Tue, 14 Jun 2016 00:33:19 +0000 (00:33 +0000)]
Merge "Swap fill_parent with match_parent in best practices doc." into mnc-io-docs
Aurimas Liutikas [Tue, 14 Jun 2016 00:31:46 +0000 (00:31 +0000)]
Merge "Correct parentActivity example in Activity Element docs." into mnc-io-docs
Yohei Yukawa [Tue, 14 Jun 2016 00:26:37 +0000 (00:26 +0000)]
Merge "Add InputConnection#insertContent()." into nyc-mr1-dev
Doris Liu [Mon, 13 Jun 2016 23:51:08 +0000 (23:51 +0000)]
Merge \"Test RenderNode\'s prepareTree when its DL is null and non-null\" into nyc-mr1-dev
am:
3d66bdb56d
Change-Id: I55aab1c33b1da1b28eb5cb0b9347d7edad5c8666
TreeHugger Robot [Mon, 13 Jun 2016 23:46:33 +0000 (23:46 +0000)]
Merge "Test RenderNode's prepareTree when its DL is null and non-null" into nyc-mr1-dev
Kevin Hufnagle [Thu, 9 Jun 2016 23:02:31 +0000 (16:02 -0700)]
docs: Expanded description of "Key Attestation" N Preview feature.
The Key Attestation section within the Android N Preview "API
Overview" page now links to a separate page, which contains a
procedure for completing the attestation process, as well as the
certificate schema and its elements' associated descriptions.
Bug:
28851641
Change-Id: If96af7f5e7e6ba9297f48f20c669591b1a9ee9ce
Android Build Merger (Role) [Mon, 13 Jun 2016 23:38:14 +0000 (23:38 +0000)]
Merge "Merge \\"CtsShim: Support building with tapas\\" into nyc-dev am:
c47168d592 am:
6b49417983" into nyc-mr1-dev-plus-aosp
Dan Willemsen [Mon, 13 Jun 2016 23:37:47 +0000 (23:37 +0000)]
Merge \\"CtsShim: Support building with tapas\\" into nyc-dev am:
c47168d592
am:
6b49417983
Change-Id: I0bcaed331650bd7ac022d1f2d1bbea817c33b4e5
ggfan [Mon, 13 Jun 2016 23:37:39 +0000 (23:37 +0000)]
Update validation-layer.jd for NDK-R12: use packed layer binaries punt building layers to Khronos github repo am:
c1755d345d am:
999b7afac8 am:
3c76d062ae
am:
a17a07ad8e
Change-Id: I023b5ae196ddd5b491c1a7c89d21e465ef3de70e
ggfan [Mon, 13 Jun 2016 23:33:00 +0000 (23:33 +0000)]
Update validation-layer.jd for NDK-R12: use packed layer binaries punt building layers to Khronos github repo am:
c1755d345d am:
999b7afac8
am:
3c76d062ae
Change-Id: Ie9bbfe3e7238dbf4e993a3478b93c89404e79bec
Android Build Merger (Role) [Mon, 13 Jun 2016 23:32:59 +0000 (23:32 +0000)]
Merge "Merge \\"CtsShim: Support building with tapas\\" into nyc-dev am:
c47168d592 am:
094a8439c9" into nyc-mr1-dev-plus-aosp
OSDN Git Service
