OSDN Git Service
smain@google.com [Fri, 29 Apr 2016 16:37:24 +0000 (16:37 +0000)]
add studio survey button to header. am:
f887aec708 am:
cc81c16143
am:
ec1a297d39
* commit '
ec1a297d39ee983dd82353ffc53428eb6da09f0c':
add studio survey button to header.
Change-Id: I4608a02f570358c8efaec0568517f1923f59e65e
smain@google.com [Fri, 29 Apr 2016 16:34:58 +0000 (16:34 +0000)]
add studio survey button to header. am:
f887aec708
am:
cc81c16143
* commit '
cc81c161431ac0bdbd460dd0ed4a56dce2a4c2b3':
add studio survey button to header.
Change-Id: Idd83cccf03d06223a625e3ae9bf66eb39c9dfd66
smain@google.com [Fri, 29 Apr 2016 16:32:31 +0000 (16:32 +0000)]
add studio survey button to header.
am:
f887aec708
* commit '
f887aec708426ca4f6dbb1def25b006813979e42':
add studio survey button to header.
Change-Id: I7b674d935116978bcd6a1c0b11ad5f54bd950f74
smain@google.com [Thu, 28 Apr 2016 23:54:06 +0000 (16:54 -0700)]
add studio survey button to header.
adds JS to save in local storage whether the user already clicked the
survey. The button appears only if they have not clicked it yet.
Change-Id: Ifc5a100a8bb8505c47d95c7cfb5aaa8cdbfdc8bd
Adam Lesinski [Thu, 28 Apr 2016 20:10:16 +0000 (20:10 +0000)]
Merge "Revert "Call aapt2 link with argument-list"" into nyc-dev
Adam Lesinski [Thu, 28 Apr 2016 20:06:53 +0000 (20:06 +0000)]
Revert "Call aapt2 link with argument-list"
This reverts commit
d4d6a50fbb69e53131d42fd35aca382ab12c8c27.
Change-Id: If84ad9921eb51ae16eae2be3cf4b2ee86b31ce80
Adam Lesinski [Thu, 28 Apr 2016 19:34:30 +0000 (19:34 +0000)]
Merge "Call aapt2 link with argument-list" into nyc-dev
TreeHugger Robot [Thu, 28 Apr 2016 05:07:54 +0000 (05:07 +0000)]
Merge "Describe required format for for PLATFORM_SECURITY_PATCH" into nyc-dev
Mohamad Ayyash [Wed, 27 Apr 2016 21:15:05 +0000 (21:15 +0000)]
Merge "Rename incr ext4 base_fs path vars. Add to product_var_list." into nyc-dev
Baligh Uddin [Wed, 27 Apr 2016 20:34:08 +0000 (20:34 +0000)]
ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1 am:
f3b80ae -s ours am:
d7aa910 -s ours am:
7f53910 -s ours
am:
bc0c779 -s ours
* commit '
bc0c779d32e30dac03cffc4be5b3af561118dd69':
ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1
Change-Id: Ib11ce5b28c4cc6543f711dc78d733720cf71ffb7
Igor Murashkin [Wed, 27 Apr 2016 18:45:47 +0000 (18:45 +0000)]
Merge "old-cts: Add testng and libcoreoj test support" into nyc-dev
Igor Murashkin [Thu, 7 Apr 2016 23:55:08 +0000 (16:55 -0700)]
old-cts: Add testng and libcoreoj test support
Bug:
27521545
Change-Id: I2a954401ce47604987a437a2741bcab252d32708
Amanda Kassay [Tue, 26 Apr 2016 22:24:05 +0000 (22:24 +0000)]
Dac-on-DevSite: Update to fix issue with sample project pages double breadcrumb and header. b/
27923494 am:
76074b1 am:
c24b430
am:
74ca66c
* commit '
74ca66c63960903eb2bb65d6db8c6f5a0675dc43':
Dac-on-DevSite: Update to fix issue with sample project pages double breadcrumb and header. b/
27923494
Change-Id: I7a70043bfe207479b0e23f5c146da65ef8fd0ba1
Amanda Kassay [Tue, 26 Apr 2016 21:26:28 +0000 (21:26 +0000)]
Dac-on-DevSite: Update to fix issue with sample project pages double breadcrumb and header. b/
27923494 am:
76074b1
am:
c24b430
* commit '
c24b4307af594a73bb5e303ebf16b0a0821ba024':
Dac-on-DevSite: Update to fix issue with sample project pages double breadcrumb and header. b/
27923494
Change-Id: I2018ed5aca9df4b1284e8cd52228e15304e01048
Amanda Kassay [Tue, 26 Apr 2016 21:22:16 +0000 (21:22 +0000)]
Dac-on-DevSite: Update to fix issue with sample project pages double breadcrumb and header. b/
27923494
am:
76074b1
* commit '
76074b1c0032b0a4de222ad3f38754fb3413c0a7':
Dac-on-DevSite: Update to fix issue with sample project pages double breadcrumb and header. b/
27923494
Change-Id: I349b08c28b68ef6c83da1ba32a1518ad60ccabab
Amanda Kassay [Tue, 26 Apr 2016 20:52:50 +0000 (16:52 -0400)]
Dac-on-DevSite: Update to fix issue with sample project pages double breadcrumb and header. b/
27923494
Change-Id: I575a7f425277ede320c1fa457770af1fe29d3583
Adam Lesinski [Tue, 26 Apr 2016 17:36:11 +0000 (10:36 -0700)]
Call aapt2 link with argument-list
Also follow symbolic links when looking for assets.
Bug:
22775504
Change-Id: I78b4e2b7d7750dfecafd64e29cf0e19dff851155
Dirk Dougherty [Tue, 26 Apr 2016 17:01:46 +0000 (17:01 +0000)]
Update samples_navtree cs template to include generated _yaml from samples TOC. am:
1a2dbb6 am:
0781792
am:
88db402
* commit '
88db402e162a6f22d133aefb8845ef4e2924d9f8':
Update samples_navtree cs template to include generated _yaml from samples TOC.
Change-Id: I116cc4df9e681dd7d542b14666ed5a67729bb021
smain@google.com [Tue, 26 Apr 2016 17:01:45 +0000 (17:01 +0000)]
remove version number from download button at bottom of page. am:
4194fc5 am:
cdb2751 am:
15dde75
am:
f5c472b
* commit '
f5c472b724cfdb7c8fb31356c273bfbe1d3678fe':
remove version number from download button at bottom of page.
Change-Id: If7b6daa0b750811b64e6ce272e51df5ca3f44ca1
smain@google.com [Tue, 26 Apr 2016 17:01:45 +0000 (17:01 +0000)]
remove version number from download button at bottom of page. am:
ba761ab am:
fbbd3fa
am:
ce735df
* commit '
ce735dfad2de7598a5f9b76eb50bf0a1d11a94e5':
remove version number from download button at bottom of page.
Change-Id: I55268cba0d6b96018518f36781ffb32ab9b8aa67
Amanda Kassay [Tue, 26 Apr 2016 17:01:45 +0000 (17:01 +0000)]
Fix for double header and footer on ndk download pages: b/
27950742 https://android-dot-devsite.googleplex.com/ndk/downloads/index.html am:
01febb9 am:
9ba538e
am:
6e66602
* commit '
6e666024449fa937ddbe9b77e082c51c78f1f304':
Fix for double header and footer on ndk download pages: b/
27950742 https://android-dot-devsite.googleplex.com/ndk/downloads/index.html
Change-Id: I0ce30c2fe5a34b8d6ca7bf4a2aa0d7cf6fdfe391
smain@google.com [Tue, 26 Apr 2016 17:01:44 +0000 (17:01 +0000)]
Merge "Remove nav toggle and up-nav for desktop size screens and remove breadcrumbs for the Studio docs, because these are not needed when there\'s only one level of "tabs"" into mnc-mr-docs am:
848295a am:
7013662
am:
f11a849
* commit '
f11a8493fd6fd8233312bf51daa94b1929a483a4':
Remove nav toggle and up-nav for desktop size screens and remove breadcrumbs for the Studio docs, because these are not needed when there's only one level of "tabs"
Change-Id: Idd3454b13d41434a4ea0127b33c184af41637be0
Amanda Kassay [Tue, 26 Apr 2016 17:01:43 +0000 (17:01 +0000)]
Added html escape for search queries to fix XSS issue b/
28135307 am:
2bb3328 am:
b32745e
am:
06abbd3
* commit '
06abbd3140f04dc5a08b57ca40c15628ae308ec3':
Added html escape for search queries to fix XSS issue b/
28135307
Change-Id: I6a594b9cf4bd07b498033521c532db726edad69c
smain@google.com [Tue, 26 Apr 2016 16:45:19 +0000 (09:45 -0700)]
resolve merge conflicts of
0e7d143 to nyc-dev
Change-Id: Ia597b62ee4cb0befc91aa3b1a9e362223583f352
Baligh Uddin [Tue, 26 Apr 2016 15:52:21 +0000 (15:52 +0000)]
ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1 am:
f3b80ae -s ours am:
d7aa910 -s ours
am:
7f53910 -s ours
* commit '
7f53910f58a99f851ee838f0d93f66f5b639ac7b':
ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1
Change-Id: Ibee22b00bc683d6efbe8b58b53edcc3a48cc4afc
Baligh Uddin [Tue, 26 Apr 2016 15:48:48 +0000 (15:48 +0000)]
ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1 am:
f3b80ae -s ours
am:
d7aa910 -s ours
* commit '
d7aa9105041cae84551651836b50153eca3cc982':
ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1
Change-Id: I384ba93902526354f52f480f9a3db55c7dfcb918
Baligh Uddin [Tue, 26 Apr 2016 15:45:50 +0000 (15:45 +0000)]
ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1
am:
f3b80ae -s ours
* commit '
f3b80aed0a13baa078e2dd4c27849ce89307372b':
ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1
Change-Id: I7002ae9407e6098a9061b7ae11a893ddf19e4de4
Narayan Kamath [Tue, 26 Apr 2016 13:22:08 +0000 (13:22 +0000)]
Merge "Revert "old-cts: Add testng and libcoreoj test support"" into nyc-dev
Narayan Kamath [Tue, 26 Apr 2016 11:03:38 +0000 (11:03 +0000)]
Revert "old-cts: Add testng and libcoreoj test support"
This reverts commit
1d4ad6a52724eee2f85b07e113909505d6c26ea0.
This topic has been reverted because it causes build flakiness and
bogus verification failures on most active changes.
Change-Id: I4a935c9a861e063e28ddc1c35bc3fa015174e81d
smain@google.com [Tue, 26 Apr 2016 03:57:07 +0000 (03:57 +0000)]
clarify what\'s in each windows package and rename the other packages to command line tools am:
6b2a986 am:
6e56ea1
am:
25afc40
* commit '
25afc407a46d213fb69c4ac33a99c6323c1b8218':
clarify what's in each windows package and rename the other packages to command line tools
Change-Id: Ie9e44bc2146303cc3c0c8ce7cba58d25bf360dae
Amanda Kassay [Tue, 26 Apr 2016 03:57:06 +0000 (03:57 +0000)]
Tabs js error fix, DevSite css issues fix, Search filtering am:
ebcf397 am:
7a697e7
am:
fafd07a
* commit '
fafd07a6b9696e6e5f8d1ba07be7bae14ea38eed':
Change-Id: I7fafc450a4902af30ecb0450c72e153f0778ffb4
smain@google.com [Tue, 26 Apr 2016 03:57:05 +0000 (03:57 +0000)]
new styles and tab-highlighting to support custom Android Studio site design am:
190e610 am:
7a7b964
am:
d82c81c
* commit '
d82c81c5d494d563769e8920e5c992cca72c0ead':
Change-Id: I905b8e014bbd4a52ede96ad0d45822461ce9f8af
smain@google.com [Tue, 26 Apr 2016 03:57:04 +0000 (03:57 +0000)]
tweak the NDK download analytics event tag am:
7281802 am:
2f7c889
am:
4d55347
* commit '
4d5534771343e1997f62f338bd572143d68b11c6':
Change-Id: Id1654a76fa95db677f8e5514bb004ee4e0138f10
Dirk Dougherty [Tue, 26 Apr 2016 03:57:02 +0000 (03:57 +0000)]
Update modal download dialogs for sdk/ndk download. Revise the redirect behavior once download completes. Add more appropriate title and download message when installing SDK tools only. Force refresh when the Studio download dialog is dismissed, to avoid leaving the dialog in stale state. Add styles for the Studio download page. am:
c607a4d am:
29e355b
am:
b969b15
* commit '
b969b1586a8daa0616f8b6234defdd5170c98a87':
Change-Id: Ic7e066ec008b7b8bdae4a016acaf91d38a324ed7
Dirk Dougherty [Tue, 26 Apr 2016 03:57:01 +0000 (03:57 +0000)]
increment version for fetched js and cs files to avoid proxy caching. am:
0d268be am:
248ef8d
am:
669d034
* commit '
669d03418e4dc427adb74811766d5d2f3b92fd07':
Change-Id: Id273784805e7b241464a314b19d8ffb0dc238c7e
Amanda Kassay [Tue, 26 Apr 2016 03:57:00 +0000 (03:57 +0000)]
Migrating web search api to custom search api on templates-sdk am:
843649b am:
e774264
am:
3752b5e
* commit '
3752b5e5b7255d4b30e886ef13f16f1bea1c7dc8':
Change-Id: I291dc31011cf081dc8fe0161a50d2ab9e155f8f5
smain@google.com [Tue, 26 Apr 2016 03:56:58 +0000 (03:56 +0000)]
new search results layout. no more custom suggestions; just API matches and organic results. am:
38b0e22 am:
4f9a67d
am:
0b4b80b
* commit '
0b4b80b774ec1ba6e383e2b7c697bb274abd2150':
Change-Id: I6d7fde3bc951a7dbd9bb9440baa23a0374805634
smain@google.com [Tue, 26 Apr 2016 03:56:56 +0000 (03:56 +0000)]
remove dev guide search suggestions, move organic search results up. tweak the search suggest for reference pages am:
1c8d4a4 am:
b7595b8
am:
f1a8ed8
* commit '
f1a8ed83a30f7421c170d33da3a799226a4020f3':
Change-Id: I6204cc7b40d10e5a76bae65417b69754fa8cf5fc
Amanda Kassay [Tue, 26 Apr 2016 03:56:54 +0000 (03:56 +0000)]
Adding book metadata to doc head, fix tabs for content build, fix for reference page double footer. am:
e4a8ab1 am:
5494db7
am:
d04c560
* commit '
d04c56090a5ffcdd2459d8714cf2773b0d8ef8c2':
Change-Id: Ifc13976e975d2a439c2887537fdaead1111aee8d
Dirk Dougherty [Tue, 26 Apr 2016 03:52:30 +0000 (03:52 +0000)]
Update samples_navtree cs template to include generated _yaml from samples TOC. am:
1a2dbb6
am:
0781792
* commit '
0781792ea7ba4b284f5e5ea1b7b44ec77ace7742':
Update samples_navtree cs template to include generated _yaml from samples TOC.
Change-Id: I4365afb722b0b5ca56f5238612da0d75444fe02a
smain@google.com [Tue, 26 Apr 2016 03:52:29 +0000 (03:52 +0000)]
remove version number from download button at bottom of page. am:
4194fc5 am:
cdb2751
am:
15dde75
* commit '
15dde75ca286eb5faae912b612683d93e12ea36a':
remove version number from download button at bottom of page.
Change-Id: I6feb68b32455ca27171b32ff34da681d55dd2d3b
smain@google.com [Tue, 26 Apr 2016 03:52:29 +0000 (03:52 +0000)]
remove version number from download button at bottom of page. am:
ba761ab
am:
fbbd3fa
* commit '
fbbd3faebd383f86a0befbb4d9a9e0b0d1fd5d02':
remove version number from download button at bottom of page.
Change-Id: I9553335b7e9cb4c3eed12302af300eff55f56a60
Amanda Kassay [Tue, 26 Apr 2016 03:52:29 +0000 (03:52 +0000)]
Fix for double header and footer on ndk download pages: b/
27950742 https://android-dot-devsite.googleplex.com/ndk/downloads/index.html am:
01febb9
am:
9ba538e
* commit '
9ba538ee05e08c099253291494ca3a9420ca30f6':
Fix for double header and footer on ndk download pages: b/
27950742 https://android-dot-devsite.googleplex.com/ndk/downloads/index.html
Change-Id: If1e8cfe488b6b970ad7ee640e817b5e8d4482a73
Scott Main [Tue, 26 Apr 2016 03:52:28 +0000 (03:52 +0000)]
Merge "Remove nav toggle and up-nav for desktop size screens and remove breadcrumbs for the Studio docs, because these are not needed when there\'s only one level of "tabs"" into mnc-mr-docs am:
848295a
am:
7013662
* commit '
70136620b6db6b6e6ad69a3eb9b3ad65e3a2edc2':
Remove nav toggle and up-nav for desktop size screens and remove breadcrumbs for the Studio docs, because these are not needed when there's only one level of "tabs"
Change-Id: I4753951b152e35703c01c8cb06373b63ac55b3dd
Amanda Kassay [Tue, 26 Apr 2016 03:52:28 +0000 (03:52 +0000)]
Added html escape for search queries to fix XSS issue b/
28135307 am:
2bb3328
am:
b32745e
* commit '
b32745ef8d8558cfae01e04c373d54298634ba47':
Added html escape for search queries to fix XSS issue b/
28135307
Change-Id: I81ac6c86286a142ee67848b172ad9ee2aa0bc5b1
smain@google.com [Tue, 26 Apr 2016 03:52:28 +0000 (03:52 +0000)]
change order of windows downloads am:
6e90dbf
am:
77ed554
* commit '
77ed554f6f0e2e99dbb6f206b9c1eade0fe7f0bf':
change order of windows downloads
Change-Id: I7fcbbeb9ab45aaaa7a7e7e76c6f557b4f3f358ef
smain@google.com [Tue, 26 Apr 2016 03:52:27 +0000 (03:52 +0000)]
clarify what\'s in each windows package and rename the other packages to command line tools am:
6b2a986
am:
6e56ea1
* commit '
6e56ea19aa90fbc6e385e33e60271985a8c422bc':
clarify what's in each windows package and rename the other packages to command line tools
Change-Id: Ie9434b0567d5f6b06fe2b9fad9d486c0e58e3c76
Amanda Kassay [Tue, 26 Apr 2016 03:52:26 +0000 (03:52 +0000)]
Tabs js error fix, DevSite css issues fix, Search filtering am:
ebcf397
am:
7a697e7
* commit '
7a697e73cb44fa401b42cfa46f4478e634ca39bc':
Change-Id: I18be4cc3d6207f067ff72245d437616817bba6b8
smain@google.com [Tue, 26 Apr 2016 03:52:26 +0000 (03:52 +0000)]
new styles and tab-highlighting to support custom Android Studio site design am:
190e610
am:
7a7b964
* commit '
7a7b9648145b47a292f7623d6e464b4486925703':
Change-Id: I770fc065da8129cfc18f692291516ea10f7d35de
smain@google.com [Tue, 26 Apr 2016 03:52:25 +0000 (03:52 +0000)]
tweak the NDK download analytics event tag am:
7281802
am:
2f7c889
* commit '
2f7c889e9d87771567afd62dec7556d7c21a4a53':
Change-Id: Ibd474c9890e336eb685d957a15570767ec87976e
Dirk Dougherty [Tue, 26 Apr 2016 03:52:24 +0000 (03:52 +0000)]
Update modal download dialogs for sdk/ndk download. Revise the redirect behavior once download completes. Add more appropriate title and download message when installing SDK tools only. Force refresh when the Studio download dialog is dismissed, to avoid leaving the dialog in stale state. Add styles for the Studio download page. am:
c607a4d
am:
29e355b
* commit '
29e355b2913349274cff1fce917b688bde24b76f':
Change-Id: I8a86e2a03d47a96b32451f38df49817d8a850bf6
Dirk Dougherty [Tue, 26 Apr 2016 03:52:23 +0000 (03:52 +0000)]
increment version for fetched js and cs files to avoid proxy caching. am:
0d268be
am:
248ef8d
* commit '
248ef8d191dd4288f09ee6ba4a2349cc8847b2ec':
Change-Id: I314f91f16effc570a6a0d1baf15b5afb1d039a79
Amanda Kassay [Tue, 26 Apr 2016 03:52:22 +0000 (03:52 +0000)]
Migrating web search api to custom search api on templates-sdk am:
843649b
am:
e774264
* commit '
e774264f515279e9030bc980bd8a5e83479ead18':
Change-Id: I98771a8e82474e5f6728642fb6c3eb30a2003142
smain@google.com [Tue, 26 Apr 2016 03:52:21 +0000 (03:52 +0000)]
new search results layout. no more custom suggestions; just API matches and organic results. am:
38b0e22
am:
4f9a67d
* commit '
4f9a67dbb37abda3d6ccea540c4fa827141ca2dc':
Change-Id: I9225b324395c0ecf0de29a5b955cf2f335615105
smain@google.com [Tue, 26 Apr 2016 03:52:20 +0000 (03:52 +0000)]
remove dev guide search suggestions, move organic search results up. tweak the search suggest for reference pages am:
1c8d4a4
am:
b7595b8
* commit '
b7595b8256de938a5461c7f2221f9c7c40eb0406':
Change-Id: I35b2b7e59416120524c364c272869cdd35ce2fd4
Amanda Kassay [Tue, 26 Apr 2016 03:52:19 +0000 (03:52 +0000)]
Adding book metadata to doc head, fix tabs for content build, fix for reference page double footer. am:
e4a8ab1
am:
5494db7
* commit '
5494db7fdb4f1f810239a63d2976eb6fa1ff2d92':
Change-Id: I94795ed54be71860b4b523453161f214394a19f9
Baligh Uddin [Mon, 25 Apr 2016 23:47:24 +0000 (23:47 +0000)]
DO NOT MERGE ANYWHERE - Add squashFS tools to otatools am:
69cf5df -s ours
am:
b664e90 -s ours
* commit '
b664e9074facc99748bcf91ec913c302cf930fbf':
DO NOT MERGE ANYWHERE - Add squashFS tools to otatools
Change-Id: I7063cddb2b6c5ec6691b386daf1a26b48723f764
Igor Murashkin [Mon, 25 Apr 2016 23:39:15 +0000 (23:39 +0000)]
Merge "old-cts: Add testng and libcoreoj test support" into nyc-dev
Mohamad Ayyash [Sat, 23 Apr 2016 00:22:07 +0000 (17:22 -0700)]
Rename incr ext4 base_fs path vars. Add to product_var_list.
BUG:
27698960
Change-Id: I4624f782846ee54525d0ac29b866a04c0d67aa40
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Keun Soo Yim [Mon, 25 Apr 2016 21:57:13 +0000 (21:57 +0000)]
Merge "build rule change for VTS (vendor test suite)'s metadata files" into nyc-dev
TreeHugger Robot [Mon, 25 Apr 2016 21:53:29 +0000 (21:53 +0000)]
Merge "Add fake libart" into nyc-dev
Keun Soo Yim [Fri, 19 Feb 2016 19:06:58 +0000 (11:06 -0800)]
build rule change for VTS (vendor test suite)'s metadata files
Change-Id: I76b81529a97b672e08632703d2f6a2777ee8811e
Dirk Dougherty [Mon, 25 Apr 2016 18:46:10 +0000 (18:46 +0000)]
Update samples_navtree cs template to include generated _yaml from samples TOC.
am:
1a2dbb6
* commit '
1a2dbb64a897f684667da6c3c2faeb88f4564123':
Update samples_navtree cs template to include generated _yaml from samples TOC.
Change-Id: I5d95e8744a5451c0442b7b67ecb8c84bbf4b107f
Dirk Dougherty [Fri, 22 Apr 2016 03:23:38 +0000 (20:23 -0700)]
Update samples_navtree cs template to include generated _yaml from samples TOC.
Change-Id: Ied2bd5b3e58d9eb2c10e8bc10678aa5d02ef1794
smain@google.com [Mon, 25 Apr 2016 18:08:53 +0000 (18:08 +0000)]
remove version number from download button at bottom of page. am:
4194fc5
am:
cdb2751
* commit '
cdb27514f91f9790a8916eb1e4e16f8d6a2f3d76':
remove version number from download button at bottom of page.
Change-Id: If1a0c80bd8d80955d4bb71f47efbd8961c0ce5c3
smain@google.com [Mon, 25 Apr 2016 18:03:27 +0000 (18:03 +0000)]
remove version number from download button at bottom of page.
am:
ba761ab
* commit '
ba761ab3333d86eeaa6bf2f4972ed7bd70ac2f7d':
remove version number from download button at bottom of page.
Change-Id: Iedbdca047db7779415ae55a29291cec8b1b9fa26
smain@google.com [Mon, 25 Apr 2016 18:03:27 +0000 (18:03 +0000)]
remove version number from download button at bottom of page.
am:
4194fc5
* commit '
4194fc52a57178ac5db68b025635accf05e3bce0':
remove version number from download button at bottom of page.
Change-Id: I80310ef73bfbba642fa35802d356360cd33a01e8
smain@google.com [Mon, 25 Apr 2016 17:56:30 +0000 (10:56 -0700)]
remove version number from download button at bottom of page.
Change-Id: I4e2b510a0ff88b987b5b9a65b6a7e89d043e946a
(cherry picked from commit
ba761ab3333d86eeaa6bf2f4972ed7bd70ac2f7d)
smain@google.com [Mon, 25 Apr 2016 17:56:30 +0000 (10:56 -0700)]
remove version number from download button at bottom of page.
Change-Id: I4e2b510a0ff88b987b5b9a65b6a7e89d043e946a
Tao Bao [Mon, 25 Apr 2016 17:03:38 +0000 (10:03 -0700)]
target_files_diff: Fix the issue with file type change.
When a file is switched from a regular file to a symlink, we should skip
the comparasion.
Bug:
28373409
Change-Id: I8fef00ab9f2d6f811fde1cadf595e8bd46af2dfd
Baligh Uddin [Mon, 25 Apr 2016 15:25:22 +0000 (08:25 -0700)]
ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1
Bug:
23967152
Baligh Uddin [Sun, 24 Apr 2016 19:46:27 +0000 (19:46 +0000)]
DO NOT MERGE ANYWHERE - Add squashFS tools to otatools
am:
69cf5df -s ours
* commit '
69cf5dfc4deee1a0d48e205c3420f5a60020bb41':
DO NOT MERGE ANYWHERE - Add squashFS tools to otatools
Change-Id: I324adea1d5eee7b1c7ebddb119f63861c6559944
Baligh Uddin [Sun, 24 Apr 2016 19:40:03 +0000 (12:40 -0700)]
DO NOT MERGE ANYWHERE - Add squashFS tools to otatools
Bug:
23967152
Zach Jang [Wed, 20 Apr 2016 22:11:57 +0000 (22:11 +0000)]
Update security patch string to 2016-06-01 am:
0a3b3d4 am:
0ca3757 am:
05a8c77 am:
d4b8d2b am:
63398dd am:
d402579
am:
3f578d2
* commit '
3f578d27312e5c075daf7e66787a1b4fe64a8a4e':
Update security patch string to 2016-06-01
Change-Id: Ia5b128d3719872fd991417620e9bee82dbc5da24
Chris Tate [Wed, 20 Apr 2016 22:10:38 +0000 (22:10 +0000)]
Merge "Wallpaper backup/restore is now in its own package" into nyc-dev
Zach Jang [Wed, 20 Apr 2016 21:55:11 +0000 (21:55 +0000)]
Update security patch string to 2016-06-01 am:
0a3b3d4 am:
0ca3757 am:
05a8c77 am:
d4b8d2b am:
63398dd
am:
d402579
* commit '
d402579bc0beb02007172259c0c686b930cc77d4':
Update security patch string to 2016-06-01
Change-Id: I4b9b46ae2fec761ec84cec722d652658bf5489e0
Zach Jang [Wed, 20 Apr 2016 21:47:54 +0000 (21:47 +0000)]
Update security patch string to 2016-06-01 am:
0a3b3d4 am:
0ca3757 am:
05a8c77 am:
d4b8d2b
am:
63398dd
* commit '
63398dd7ea01ea331e2ea362c3235b79fefd5cfe':
Update security patch string to 2016-06-01
Change-Id: Icea8df8e59f72146ecf737473cbba19d0b6aba5d
Zach Jang [Wed, 20 Apr 2016 21:42:16 +0000 (21:42 +0000)]
Update security patch string to 2016-06-01 am:
0a3b3d4 am:
0ca3757 am:
05a8c77
am:
d4b8d2b
* commit '
d4b8d2b59f804544e09cb3e600ff290792470999':
Update security patch string to 2016-06-01
Change-Id: I837a9f96b9d35f315b2bf92e600084ecb879b264
Zach Jang [Wed, 20 Apr 2016 21:35:11 +0000 (21:35 +0000)]
Update security patch string to 2016-06-01 am:
0a3b3d4 am:
0ca3757
am:
05a8c77
* commit '
05a8c77e4231828db15aee343f79ebd2dd6607dd':
Update security patch string to 2016-06-01
Change-Id: I427cd7ac7b33d5f5891ccd96a4fbaeb0a0f7c5e7
Zach Jang [Wed, 20 Apr 2016 19:50:19 +0000 (19:50 +0000)]
Update security patch string to 2016-06-01 am:
0a3b3d4
am:
0ca3757
* commit '
0ca37573e53bc3a481daa3a807dfc6960227fb0f':
Update security patch string to 2016-06-01
Change-Id: I91bf9e0ce857dbb6cde8132e97499011b2325ba2
Zach Jang [Wed, 20 Apr 2016 18:49:54 +0000 (18:49 +0000)]
Update security patch string to 2016-06-01
am:
0a3b3d4
* commit '
0a3b3d40c10e76e75d11a0c3cddc3ea637871886':
Update security patch string to 2016-06-01
Change-Id: I276f6d99393230230e514c6613d7a7d858a78a9a
Bo Hu [Wed, 20 Apr 2016 18:46:37 +0000 (18:46 +0000)]
Merge "Fix emulator specific SELinux denials related to qemu.gles" into nyc-dev
Trevor Johns [Wed, 20 Apr 2016 18:35:54 +0000 (18:35 +0000)]
Merge "Revert "Revert "Merge "Resolve merge conflicts of
a5f0068 to nyc-dev" into nyc-dev""" into nyc-dev
TreeHugger Robot [Wed, 20 Apr 2016 01:54:54 +0000 (01:54 +0000)]
Merge "Make jack_check_timestamp depend on setup-jack-server" into nyc-dev
Colin Cross [Wed, 20 Apr 2016 00:22:29 +0000 (17:22 -0700)]
Make jack_check_timestamp depend on setup-jack-server
Some builds were failing with:
[ 3% 2226/61362] /bin/bash out/target/common/obj/JAVA_LIBRARIES/core-all_intermediates/jack.check.timestamp.rsp
FAILED: /bin/bash out/target/common/obj/JAVA_LIBRARIES/core-all_intermediates/jack.check.timestamp.rsp
No Jack server running. Try 'jack-admin start-server'
While jack-admin was running concurrently:
[ 3% 2226/61362] /bin/bash -c "(prebuilts/sdk/tools/jack-admin stop-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin kill-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin uninstall-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin install-server prebuilts/sdk/tools/jack-launcher.jar prebuilts/sdk/tools/jack-server-4.8.ALPHA.jar 2>&1 || (exit 0) ) && (mkdir -p \"/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/
2779793/logs/jack/\" ) && (JACK_SERVER_VM_ARGUMENTS=\"-Dfile.encoding=UTF-8 -XX:+TieredCompilation -Dcom.android.jack.server.log.file=/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/
2779793/logs/jack/jack-server-%u-%g.log\" prebuilts/sdk/tools/jack-admin start-server 2>&1 || exit 0 ) && (prebuilts/sdk/tools/jack-admin update server prebuilts/sdk/tools/jack-server-4.8.ALPHA.jar 4.8.ALPHA 2>&1 || exit 0 ) && (prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-2.28.RELEASE.jar 2.28.RELEASE || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.26.ALPHA.jar 3.26.ALPHA || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.27.BETA.jar 3.27.BETA || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.30.BETA.jar 3.30.BETA || exit 47 )"
Stopping background server
Killing background server
No Jack server to kill
Removing jack server from "/Users/android-build/.jack-server"
Installing jack server in "/Users/android-build/.jack-server"
Launching Jack server java -XX:MaxJavaStackTraceDepth=-1 -Djava.io.tmpdir=/buildbot/tmp -Dfile.encoding=UTF-8 -XX:+TieredCompilation -Dcom.android.jack.server.log.file=/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/
2779793/logs/jack/jack-server-%u-%g.log -cp /Users/android-build/.jack-server/launcher.jar com.android.jack.launcher.ServerLauncher
Change-Id: Ib35f313daee93dc6a3548e652cbcd4cb4d304f93
bohu [Tue, 19 Apr 2016 22:04:58 +0000 (15:04 -0700)]
Fix emulator specific SELinux denials related to qemu.gles
init: avc: denied { set } for property=qemu.gles pid=108 uid=1003 gid=1003 scontext=u:r:bootanim:s0 tcontext=u:object_r:qemu_prop:s0 tclass=property_service permissive=1
init: avc: denied { set } for property=qemu.gles pid=75 uid=0 gid=0 scontext=u:r:zygote:s0 tcontext=u:object_r:qemu_prop:s0 tclass=property_service permissive=1
bug:
28221393
Change-Id: Icb0ee7fbf9a7b985f66fac087a48d9b5789e2b67
Alex Light [Fri, 15 Apr 2016 17:19:02 +0000 (10:19 -0700)]
Add fake libart
Bug:
27775991
Change-Id: I54cbdf2340dcfdd9b3973d9d10c8bd94492736fb
Ying Wang [Tue, 19 Apr 2016 19:13:54 +0000 (12:13 -0700)]
Don't reset LOCAL_*MODULE_STEM.
By resetting we lose LOCAL_*MODULE_STEM values for the second include
of the *_internal.mk.
We don't need to reset because we now store the default value to a
temporary variable my_*module_stem in configure_module_stem.mk.
Bug:
27775991
(cherry picked from commit
c160c3f21a878bebcc94e0a282a6b2b899b356bb)
Change-Id: I5d9b7f7214d98a1bf953fadb9951a8af1e993057
Christopher Tate [Wed, 13 Apr 2016 01:24:53 +0000 (18:24 -0700)]
Wallpaper backup/restore is now in its own package
Bug
25453848
Bug
25727875
Change-Id: I774afad99d23f4f7ffb1675909a5a17732af3fb8
Zach Jang [Tue, 19 Apr 2016 17:56:31 +0000 (10:56 -0700)]
Update security patch string to 2016-06-01
b/
28269112
Change-Id: Icf65bbf784951d1f9b56ce88f59b50661af1a32c
Trevor Johns [Tue, 19 Apr 2016 08:15:39 +0000 (01:15 -0700)]
Revert "Revert "Merge "Resolve merge conflicts of
a5f0068 to nyc-dev" into nyc-dev""
This reverts commit
bf234fdfba1116cc29e8cc8443d08804843edf94.
Nick Kralevich [Mon, 18 Apr 2016 20:28:04 +0000 (13:28 -0700)]
Address emulator specific SELinux denials
Fix the following denials:
avc: denied { search } for pid=222 comm="system_server"
name="qemu_trace" dev="sysfs" ino=45 scontext=u:r:system_server:s0
tcontext=u:object_r:sysfs_writable:s0 tclass=dir permissive=1
avc: denied { open } for pid=222 comm="system_server"
name="u:object_r:opengles_prop:s0" dev="tmpfs" ino=1429
scontext=u:r:system_server:s0 tcontext=u:object_r:opengles_prop:s0
tclass=file permissive=1
avc: denied { read } for pid=222 comm="system_server"
name="u:object_r:radio_noril_prop:s0" dev="tmpfs" ino=1430
scontext=u:r:system_server:s0 tcontext=u:object_r:radio_noril_prop:s0
tclass=file permissive=1
avc: denied { open } for pid=222 comm="system_server"
name="u:object_r:radio_noril_prop:s0" dev="tmpfs" ino=1430
scontext=u:r:system_server:s0 tcontext=u:object_r:radio_noril_prop:s0
tclass=file permissive=1
avc: denied { getattr } for pid=222 comm="system_server"
path="/dev/__properties__/u:object_r:radio_noril_prop:s0" dev="tmpfs"
ino=1430 scontext=u:r:system_server:s0
tcontext=u:object_r:radio_noril_prop:s0 tclass=file permissive=1
avc: denied { search } for pid=424 comm="putmethod.latin"
name="qemu_trace" dev="sysfs" ino=45
scontext=u:r:untrusted_app:s0:c512,c768
tcontext=u:object_r:sysfs_writable:s0 tclass=dir permissive=1
Bug:
28221393
Change-Id: I6fce1127d9d9e8bc0119bace3f142d51382401c0
Amanda Kassay [Mon, 18 Apr 2016 20:20:18 +0000 (20:20 +0000)]
Fix for double header and footer on ndk download pages: b/
27950742 https://android-dot-devsite.googleplex.com/ndk/downloads/index.html
am:
01febb9
* commit '
01febb96753b08b019fb3cf53b37e4e309fbb293':
Fix for double header and footer on ndk download pages: b/
27950742 https://android-dot-devsite.googleplex.com/ndk/downloads/index.html
Change-Id: If7159b036f78455304b82dc9cb48d3bcd63948da
Amanda Kassay [Mon, 18 Apr 2016 16:55:17 +0000 (12:55 -0400)]
Fix for double header and footer on ndk download pages: b/
27950742
https://android-dot-devsite.googleplex.com/ndk/downloads/index.html
Fix for html code in page title and h1 tag: b/
28237039
https://android-dot-devsite.googleplex.com/guide/topics/manifest/manifest-element.html
Change-Id: Idc9ba0a1ba33d1b89b7dbfd3d620d0e587c57459
smain@google.com [Fri, 15 Apr 2016 21:38:12 +0000 (21:38 +0000)]
Merge "Remove nav toggle and up-nav for desktop size screens and remove breadcrumbs for the Studio docs, because these are not needed when there\'s only one level of "tabs"" into mnc-mr-docs
am:
848295a
* commit '
848295aea9bfd679c1d3aa157130c1480ee2025d':
Remove nav toggle and up-nav for desktop size screens and remove breadcrumbs for the Studio docs, because these are not needed when there's only one level of "tabs"
Change-Id: Ibed5aa568eb86b62377fefd47c7077fc4080e3eb
Scott Main [Fri, 15 Apr 2016 21:29:04 +0000 (21:29 +0000)]
Merge "Remove nav toggle and up-nav for desktop size screens and remove breadcrumbs for the Studio docs, because these are not needed when there's only one level of "tabs"" into mnc-mr-docs
Tao Bao [Fri, 15 Apr 2016 03:22:23 +0000 (03:22 +0000)]
Merge "Skip verifying the partition with no changed blocks." into nyc-dev
TreeHugger Robot [Fri, 15 Apr 2016 00:33:43 +0000 (00:33 +0000)]
Merge "Revert "Set WifiHAL to only log debug by default."" into nyc-dev
Sebastien Hertz [Thu, 14 Apr 2016 23:17:18 +0000 (23:17 +0000)]
Merge "Allow to force min sdk given to Jack" into nyc-dev
Tao Bao [Thu, 14 Apr 2016 22:58:05 +0000 (15:58 -0700)]
Skip verifying the partition with no changed blocks.
For incremental BBOTAs, commit [1] changed to verify only the touched
blocks to reduce the update time. This CL fixes the bug when there's no
changed block between the two builds.
[1]: commit
d522bdc9edbf64d15a59c6924853b2e2c8c39e90
Bug:
27813356
Bug:
28195498
Change-Id: Ia752d3cf034c544517458ed15df509d4596e21fa
OSDN Git Service
