Dan Stoza
ff0fd30f88
Merge "Remove DispSync default value/docs" into nyc-mr1-dev
2016-09-12 17:37:52 +00:00
Scott Main
01fd07b19d
Merge "add support for constraint layout's DATA list" into nyc-dev am: 64bd41ff7d
...
am: be56d3b2b2
Change-Id: Ie3b6e3504cd6d45e8214e7a688a3f1c5d12100e5
2016-09-10 01:35:21 +00:00
smain@google.com
6fee24869b
add support for constraint layout's DATA list am: 7055897faa
...
am: 210083ab97
Change-Id: Ic55ead4d5ceda3c937a62fd1b82c35b6de60af63
2016-09-10 01:35:21 +00:00
Scott Main
be56d3b2b2
Merge "add support for constraint layout's DATA list" into nyc-dev
...
am: 64bd41ff7d
Change-Id: I93e87b680a6bba3d90de2ef4f8f16bc02afb33ab
2016-09-10 01:32:55 +00:00
smain@google.com
210083ab97
add support for constraint layout's DATA list
...
am: 7055897faa
Change-Id: I9781454790423d51385094aaa530d994cccb1016
2016-09-10 01:32:24 +00:00
Scott Main
64bd41ff7d
Merge "add support for constraint layout's DATA list" into nyc-dev
2016-09-10 01:28:09 +00:00
smain@google.com
7055897faa
add support for constraint layout's DATA list
...
Change-Id: Ia301ad235dcfd5a5c2bb13bfa6daa753f9206800
2016-09-09 15:47:58 -07:00
Dan Stoza
ae5e550f81
Remove DispSync default value/docs
...
Moves DispSync phase offset default values and documentation to
frameworks/native/services/surfaceflinger/Android.mk.
Bug: 30801895
Change-Id: I44a4355b2d112561b94ccfc6e9c3365885c205ad
2016-09-09 13:53:52 -07:00
smain@google.com
22f2435e98
delete 'templates-sdk-dev', all these files were merged back into 'templates-sdk' with this CL: https://googleplex-android-review.git.corp.google.com/#/c/1394582/ and this depends on the following CL to update all the doc build targets: https://googleplex-android-review.git.corp.google.com/#/c/1406302/ am: 6c8efecbda
...
am: 21c9005ff1
Change-Id: Ie20f642bcbadec94524189f74bb06312fb232bdf
2016-09-02 21:42:03 +00:00
smain@google.com
21c9005ff1
delete 'templates-sdk-dev', all these files were merged back into 'templates-sdk' with this CL: https://googleplex-android-review.git.corp.google.com/#/c/1394582/ and this depends on the following CL to update all the doc build targets: https://googleplex-android-review.git.corp.google.com/#/c/1406302/
...
am: 6c8efecbda
Change-Id: I4692f455ed30f7cbbb10c40b35718c8a8952b27e
2016-09-02 21:36:14 +00:00
smain@google.com
6c8efecbda
delete 'templates-sdk-dev', all these files were merged
...
back into 'templates-sdk' with this CL:
https://googleplex-android-review.git.corp.google.com/#/c/1394582/
and this depends on the following CL to update all the doc build targets:
https://googleplex-android-review.git.corp.google.com/#/c/1406302/
Change-Id: Id38134e1d35c5235bb66241c50945b55ac9de1dd
2016-09-02 11:02:41 -07:00
smain@google.com
26ded8766f
Merge all of templates-sdk-dev into templates-sdk. I actually just deleted templates-sdk/ then made a copy of templates-sdk-dev/ and then renamed it to templates-sdk/. So this is a clean copy. Once this goes through cleanly, I'll delete templates-sdk-dev/ and update all doc targets to use templates-sdk/. am: 4f3a05a2c6
...
am: 5c7588bd37
Change-Id: I0e32bd45e5c12541b7dd65d25a0f09e04ab052bc
2016-08-31 22:16:24 +00:00
smain@google.com
5c7588bd37
Merge all of templates-sdk-dev into templates-sdk. I actually just deleted templates-sdk/ then made a copy of templates-sdk-dev/ and then renamed it to templates-sdk/. So this is a clean copy. Once this goes through cleanly, I'll delete templates-sdk-dev/ and update all doc targets to use templates-sdk/.
...
am: 4f3a05a2c6
Change-Id: I11564954529ed7a1cd1098c66b052190f3d3d6f6
2016-08-31 22:13:34 +00:00
smain@google.com
4f3a05a2c6
Merge all of templates-sdk-dev into templates-sdk.
...
I actually just deleted templates-sdk/ then made a copy of templates-sdk-dev/
and then renamed it to templates-sdk/. So this is a clean copy.
Once this goes through cleanly, I'll delete templates-sdk-dev/ and update
all doc targets to use templates-sdk/.
Change-Id: I276695969e02fcf718370564e84b077a9d43725e
2016-08-31 11:30:02 -07:00
smain@google.com
f1d6b8f2a8
delete templates-ds (the original attempt to template docs for devsite) delete templates-sdk-refonly (the "dev branch" for the reference only flag) am: 6d00e69c3f
...
am: e4b21d82eb
Change-Id: Icdd4610ccf5cbd2190e2199d5a8a0d56bbc7fa5e
2016-08-31 15:08:54 +00:00
smain@google.com
e4b21d82eb
delete templates-ds (the original attempt to template docs for devsite) delete templates-sdk-refonly (the "dev branch" for the reference only flag)
...
am: 6d00e69c3f
Change-Id: Id709e0c519d6a79e45f6865f7fac200762501091
2016-08-31 15:05:54 +00:00
smain@google.com
6d00e69c3f
delete templates-ds (the original attempt to template docs for devsite)
...
delete templates-sdk-refonly (the "dev branch" for the reference only flag)
Change-Id: I73e2760fcca76b7242be9aefa92006df3a555a03
2016-08-30 13:55:16 -07:00
Scott Main
8f6711e757
Merge "delete no-longer-used custom sdkpage template. depends on https://googleplex-android-review.git.corp.google.com/#/c/1389393/ " into nyc-dev am: 1b1c5c5ebc
...
am: 18a8c0ce2c
Change-Id: Ie9ab4865ccac5122c248d1ec2dacd33b7c6d227a
2016-08-30 20:52:47 +00:00
smain@google.com
6deecc4c35
delete no-longer-used custom sdkpage template. depends on https://googleplex-android-review.git.corp.google.com/#/c/1389393/ am: 42859fae46
...
am: 618756ab95
Change-Id: I1612257f35456b60c30efe8af1c71fdaa664287f
2016-08-30 20:52:43 +00:00
Scott Main
15a31da970
Merge "update templates-sdk-dev to support the referenceonly build. includes an updated snapshot of the css and js files from devsite" into nyc-dev am: a7e978b6b6
...
am: f0fe351430
Change-Id: I82bd9af856ba109d63b5c18f95c3615f225ea0c2
2016-08-30 20:52:41 +00:00
smain@google.com
9674a9975a
update templates-sdk-dev to support the referenceonly build. includes an updated snapshot of the css and js files from devsite am: eeeb9b832a
...
am: 7501218e40
Change-Id: I72333523c78eaa5889656b43f885fda03ce8fd7d
2016-08-30 20:52:40 +00:00
Scott Main
18a8c0ce2c
Merge "delete no-longer-used custom sdkpage template. depends on https://googleplex-android-review.git.corp.google.com/#/c/1389393/ " into nyc-dev
...
am: 1b1c5c5ebc
Change-Id: I9083864cbb23bd0bff4a94ecbe31afcbd88d5f90
2016-08-30 20:47:14 +00:00
smain@google.com
618756ab95
delete no-longer-used custom sdkpage template. depends on https://googleplex-android-review.git.corp.google.com/#/c/1389393/
...
am: 42859fae46
Change-Id: I0a5a870f5cbc5c0ba2e620a8cf2cb8b497bbec1d
2016-08-30 20:47:12 +00:00
Scott Main
f0fe351430
Merge "update templates-sdk-dev to support the referenceonly build. includes an updated snapshot of the css and js files from devsite" into nyc-dev
...
am: a7e978b6b6
Change-Id: Ia8ac8aca9a9d2ad653325a96b4e20cb75fa529e7
2016-08-30 20:47:10 +00:00
smain@google.com
7501218e40
update templates-sdk-dev to support the referenceonly build. includes an updated snapshot of the css and js files from devsite
...
am: eeeb9b832a
Change-Id: Ieed1beceb693ecae6be25c878b40bd6dd697aad2
2016-08-30 20:47:10 +00:00
Scott Main
1b1c5c5ebc
Merge "delete no-longer-used custom sdkpage template. depends on https://googleplex-android-review.git.corp.google.com/#/c/1389393/ " into nyc-dev
2016-08-30 20:39:44 +00:00
Scott Main
a7e978b6b6
Merge "update templates-sdk-dev to support the referenceonly build. includes an updated snapshot of the css and js files from devsite" into nyc-dev
2016-08-30 20:39:20 +00:00
smain@google.com
42859fae46
delete no-longer-used custom sdkpage template.
...
depends on https://googleplex-android-review.git.corp.google.com/#/c/1389393/
Change-Id: Idd8f039294fe8c2c6dddf6d8a00a196222154d58
2016-08-30 10:52:40 -07:00
smain@google.com
eeeb9b832a
update templates-sdk-dev to support the referenceonly build.
...
includes an updated snapshot of the css and js files from devsite
Change-Id: Ib597c1dd488347795e02e1d09880559ead1d54e0
2016-08-30 10:22:51 -07:00
Amanda Kassay
065e5e3fac
Remove hard coded leading slash in head_tag.cs for DevSite image_path meta tag. am: c9ef9fea7f
...
am: ea99b7d8bd
Change-Id: I69525953da23cb2f95776530f409d8f39882e547
2016-08-30 16:55:24 +00:00
Amanda Kassay
ea99b7d8bd
Remove hard coded leading slash in head_tag.cs for DevSite image_path meta tag.
...
am: c9ef9fea7f
Change-Id: I9a4bde7048fc92fe694175bb349b0a82700e3da4
2016-08-30 16:52:54 +00:00
Amanda Kassay
c9ef9fea7f
Remove hard coded leading slash in head_tag.cs for DevSite image_path meta tag.
...
Change-Id: I994148882b2f4fbe233f02eb8e35c335af0c32f8
2016-08-29 17:13:49 -04:00
Adam Seaton
57866742e7
Update comments around PLATFORM_SECURITY_LEVEL (nyc-dev) Bug: 29881091 am: c63e4295ef
...
am: 89c03f5748
Change-Id: I889917b2f72b429071ef906b1ed9ff8460d62c16
2016-08-26 03:14:16 +00:00
Adam Seaton
89c03f5748
Update comments around PLATFORM_SECURITY_LEVEL (nyc-dev) Bug: 29881091
...
am: c63e4295ef
Change-Id: I9cb5cbb053ebb79b08a0d75bff21932bb8eaee33
2016-08-26 03:11:47 +00:00
Adam Seaton
c63e4295ef
Update comments around PLATFORM_SECURITY_LEVEL
...
(nyc-dev)
Bug: 29881091
Change-Id: I2bdaf7f796ab94b14416aaed6d68dc3a239ea5f9
2016-08-25 19:46:06 -07:00
Adam Seaton
ad89954e9d
Update comments around PLATFORM_SECURITY_LEVEL am: 65994c1d13
am: 1ebc73f23f
am: 0c92547698
am: 3a5317e220
am: 9a14234c5a
am: e00f2b31e8
am: 4413af98c3
-s ours am: 9f51f51621
am: bc55deeeba
am: 9ce9491854
am: d4131055ba
am: b81d5148b3
...
am: 39ab143acf
Change-Id: If091a2975b74329b1fcaa51479a370af74a47e9c
2016-08-26 02:44:15 +00:00
Adam Seaton
39ab143acf
Update comments around PLATFORM_SECURITY_LEVEL am: 65994c1d13
am: 1ebc73f23f
am: 0c92547698
am: 3a5317e220
am: 9a14234c5a
am: e00f2b31e8
am: 4413af98c3
-s ours am: 9f51f51621
am: bc55deeeba
am: 9ce9491854
am: d4131055ba
...
am: b81d5148b3
Change-Id: I4523969c433f99b62145d9de623a9a94358fa5d2
2016-08-26 02:41:44 +00:00
Adam Seaton
b81d5148b3
Update comments around PLATFORM_SECURITY_LEVEL am: 65994c1d13
am: 1ebc73f23f
am: 0c92547698
am: 3a5317e220
am: 9a14234c5a
am: e00f2b31e8
am: 4413af98c3
-s ours am: 9f51f51621
am: bc55deeeba
am: 9ce9491854
...
am: d4131055ba
Change-Id: I2bff549092b33f0217cc40be8c40b94035d76f9a
2016-08-26 02:36:14 +00:00
Adam Seaton
a97fb75e25
Update comments around PLATFORM_SECURITY_LEVEL am: f45494279a
am: 9c5fb5f013
am: c0e2351f9e
am: 38858627da
-s ours am: a8339635be
...
am: b650a32ae0
Change-Id: I4a438a4ad3324a0cf2b2ad28f582e89f9cea5b97
2016-08-26 02:33:48 +00:00
Adam Seaton
d4131055ba
Update comments around PLATFORM_SECURITY_LEVEL am: 65994c1d13
am: 1ebc73f23f
am: 0c92547698
am: 3a5317e220
am: 9a14234c5a
am: e00f2b31e8
am: 4413af98c3
-s ours am: 9f51f51621
am: bc55deeeba
...
am: 9ce9491854
Change-Id: I1b502a65efc87459d08aebef45e84c33ebfc10a9
2016-08-26 02:33:48 +00:00
Adam Seaton
b650a32ae0
Update comments around PLATFORM_SECURITY_LEVEL am: f45494279a
am: 9c5fb5f013
am: c0e2351f9e
am: 38858627da
-s ours
...
am: a8339635be
Change-Id: Ic5120543210c28ec80b36a83c821957a54ff5ae2
2016-08-26 02:30:42 +00:00
Adam Seaton
9ce9491854
Update comments around PLATFORM_SECURITY_LEVEL am: 65994c1d13
am: 1ebc73f23f
am: 0c92547698
am: 3a5317e220
am: 9a14234c5a
am: e00f2b31e8
am: 4413af98c3
-s ours am: 9f51f51621
...
am: bc55deeeba
Change-Id: I92936e1eb94d3e2e2f14298de77f841655e20735
2016-08-26 02:28:13 +00:00
Adam Seaton
a8339635be
Update comments around PLATFORM_SECURITY_LEVEL am: f45494279a
am: 9c5fb5f013
am: c0e2351f9e
...
am: 38858627da
-s ours
Change-Id: I783876b68d99ef09f78a2ec612cc70cea3320f59
2016-08-26 02:28:12 +00:00
Adam Seaton
bc55deeeba
Update comments around PLATFORM_SECURITY_LEVEL am: 65994c1d13
am: 1ebc73f23f
am: 0c92547698
am: 3a5317e220
am: 9a14234c5a
am: e00f2b31e8
am: 4413af98c3
-s ours
...
am: 9f51f51621
Change-Id: I9238f390af82336565b03aec0d7dcce16ad349d2
2016-08-26 02:25:43 +00:00
Adam Seaton
9f51f51621
Update comments around PLATFORM_SECURITY_LEVEL am: 65994c1d13
am: 1ebc73f23f
am: 0c92547698
am: 3a5317e220
am: 9a14234c5a
am: e00f2b31e8
...
am: 4413af98c3
-s ours
Change-Id: I85765c2c3be587d6f2ba1289cf981a0d657062fa
2016-08-26 02:23:12 +00:00
Adam Seaton
4413af98c3
Update comments around PLATFORM_SECURITY_LEVEL am: 65994c1d13
am: 1ebc73f23f
am: 0c92547698
am: 3a5317e220
am: 9a14234c5a
...
am: e00f2b31e8
Change-Id: I2f0955ad737fad5f5bb5bef806a797afa3bbffcf
2016-08-25 23:45:33 +00:00
Adam Seaton
e00f2b31e8
Update comments around PLATFORM_SECURITY_LEVEL am: 65994c1d13
am: 1ebc73f23f
am: 0c92547698
am: 3a5317e220
...
am: 9a14234c5a
Change-Id: I3fba21ddab4152b50262a5176969204b69ec5c8f
2016-08-25 23:42:32 +00:00
Adam Seaton
38858627da
Update comments around PLATFORM_SECURITY_LEVEL am: f45494279a
am: 9c5fb5f013
...
am: c0e2351f9e
Change-Id: I84d07e755deeae24a682a343ec84984ebf8757df
2016-08-25 23:39:01 +00:00
Adam Seaton
9a14234c5a
Update comments around PLATFORM_SECURITY_LEVEL am: 65994c1d13
am: 1ebc73f23f
am: 0c92547698
...
am: 3a5317e220
Change-Id: Ib1681ee04d1862ca8f5f865b659c5a4d1ec2f0ca
2016-08-25 23:39:01 +00:00
Adam Seaton
3a5317e220
Update comments around PLATFORM_SECURITY_LEVEL am: 65994c1d13
am: 1ebc73f23f
...
am: 0c92547698
Change-Id: I1c890fb96cf9f9a3205b7df581e432b3421c8fc6
2016-08-25 23:35:59 +00:00