OSDN Git Service
Nicholas Sauer [Wed, 11 May 2016 14:35:14 +0000 (14:35 +0000)]
Merge "Add org.apache.harmony.tests.javax.xml to old cts" into nyc-dev
Dirk Dougherty [Wed, 11 May 2016 02:01:49 +0000 (02:01 +0000)]
For reference extension builds, update book_path to reference the appropriate file location. am:
8dbd7b96cf am:
ce46b86219
am:
1d2dbfe4f5
* commit '
1d2dbfe4f5d929d5c671a1d73ec38d8246b1b17a':
For reference extension builds, update book_path to reference the appropriate file location.
Change-Id: Id5ddec169d92b36f05a1d29b189b92f74396acb5
Dirk Dougherty [Wed, 11 May 2016 01:58:57 +0000 (01:58 +0000)]
For reference extension builds, update book_path to reference the appropriate file location. am:
8dbd7b96cf
am:
ce46b86219
* commit '
ce46b86219b973a5f90d16e5e59073952ef01519':
For reference extension builds, update book_path to reference the appropriate file location.
Change-Id: Icc7e68ec871661b3d2824452a4c12b24f9a83aee
Dirk Dougherty [Wed, 11 May 2016 01:56:11 +0000 (01:56 +0000)]
For reference extension builds, update book_path to reference the appropriate file location.
am:
8dbd7b96cf
* commit '
8dbd7b96cfd667866f992d8bf5252eb8bef29ccc':
For reference extension builds, update book_path to reference the appropriate file location.
Change-Id: I2555dee5e78998d8e042cfe22c45d9dadd469149
Dirk Dougherty [Wed, 11 May 2016 00:56:19 +0000 (17:56 -0700)]
For reference extension builds, update book_path to reference the appropriate file location.
Change-Id: I1eab8fcde8348e7cd7efa90c5c1768b1103e5b97
Nicholas Sauer [Tue, 10 May 2016 19:54:32 +0000 (12:54 -0700)]
Add org.apache.harmony.tests.javax.xml to old cts
bug:
28556024
Change-Id: I7903ce93f27aef55f55acc9231e631d11a463f1b
Andreas Gampe [Fri, 29 Apr 2016 21:34:10 +0000 (14:34 -0700)]
Build: Switch on oat file mini-debug-info for boot.oat
Enable mini-debug-info for the boot image by default. This
can be disabled with WITH_DEXPREOPT_DEBUG_INFO=false.
Bug:
28474219
(cherry picked from commit
58f6bfaa37946835b3a4da279e4e4743181da159)
Change-Id: Ifd59d854f01ad8cf703f16d7a6e88c2c82d47feb
Roozbeh Pournader [Fri, 6 May 2016 23:51:48 +0000 (23:51 +0000)]
Merge "Remove Romansh from PRODUCT_LOCALES" into nyc-dev
Roozbeh Pournader [Fri, 6 May 2016 22:10:51 +0000 (15:10 -0700)]
Remove Romansh from PRODUCT_LOCALES
The inclusion of Romansh (rm_CH), while it did not have localized
strings, was causing the incorrect assumption that the system
supports Romansh, causing the language fallback to work incorrectly
when Romansh was in the list of user's locales.
Hindi (hi_IN) was also included twice, and this removes the duplicate
too.
Bug:
27325465
Change-Id: I87ec06dc459137f71bb8e5e2f431f629bd51928e
Scott Main [Fri, 6 May 2016 16:37:05 +0000 (16:37 +0000)]
Revert "add studio survey button to header." 40k responses is probably enough. am:
4d6e15df03 am:
fa46661aa7 am:
3ff492deee
am:
20324e21f9
* commit '
20324e21f9752fcae8775f1a65dc24ffffe592e7':
Revert "add studio survey button to header." 40k responses is probably enough.
Change-Id: I22deb175299dd6614dc72c6daaa5baf2fab9342a
Scott Main [Fri, 6 May 2016 16:32:20 +0000 (16:32 +0000)]
Revert "add studio survey button to header." 40k responses is probably enough. am:
4d6e15df03 am:
fa46661aa7
am:
3ff492deee
* commit '
3ff492deee3df77f6a1ce8afa0fc8ac75d8808c2':
Revert "add studio survey button to header." 40k responses is probably enough.
Change-Id: Ib0bfd417c340f1f5d734f4551813cd6079b28f3e
Scott Main [Fri, 6 May 2016 16:27:28 +0000 (16:27 +0000)]
Revert "add studio survey button to header." 40k responses is probably enough. am:
4d6e15df03
am:
fa46661aa7
* commit '
fa46661aa7990698cc4e6e65b830a3ce94edcb07':
Revert "add studio survey button to header." 40k responses is probably enough.
Change-Id: I260ad3f4292699b37e8a9def1c259a95a5713c1c
Scott Main [Fri, 6 May 2016 16:22:24 +0000 (16:22 +0000)]
Revert "add studio survey button to header." 40k responses is probably enough.
am:
4d6e15df03
* commit '
4d6e15df032f561d64a11190df052aec364a3d47':
Revert "add studio survey button to header." 40k responses is probably enough.
Change-Id: I7fd13ab441835b3515e5a66aeda8e27ce748c8a8
Scott Main [Fri, 6 May 2016 16:08:56 +0000 (16:08 +0000)]
Revert "add studio survey button to header."
40k responses is probably enough.
This reverts commit
075aad742a9d12d43435e7b909a6a999c1050f6c.
Change-Id: I0c1964fda243c32f57156e762edec511314d9cb5
Bjoern Johansson [Thu, 5 May 2016 15:38:32 +0000 (15:38 +0000)]
Merge "Indicate that all emulator images support USB" into nyc-dev
Amanda Kassay [Thu, 5 May 2016 14:02:00 +0000 (14:02 +0000)]
Update to reference templates to include resources to fix navigation highlighting issues. b/
28560594 b/
28586131 am:
307d36d9d4 am:
aa012638d6
am:
69ef986675
* commit '
69ef986675f98d48f98c2d8a28492a5b636ef2da':
Update to reference templates to include resources to fix navigation highlighting issues. b/
28560594 b/
28586131
Change-Id: Id3e9210f4c704e13b1c3c5a6cf8219f2d83080a8
Amanda Kassay [Thu, 5 May 2016 13:59:33 +0000 (13:59 +0000)]
Update to reference templates to include resources to fix navigation highlighting issues. b/
28560594 b/
28586131 am:
307d36d9d4
am:
aa012638d6
* commit '
aa012638d607cd8d0dc919ffcffd8009bcc389e4':
Update to reference templates to include resources to fix navigation highlighting issues. b/
28560594 b/
28586131
Change-Id: Ib64ca322b4a86f8ae4cd55e087bce7ab74720963
Amanda Kassay [Thu, 5 May 2016 13:57:02 +0000 (13:57 +0000)]
Update to reference templates to include resources to fix navigation highlighting issues. b/
28560594 b/
28586131
am:
307d36d9d4
* commit '
307d36d9d4938f6e7ff92d54f3962f23c073f5dc':
Update to reference templates to include resources to fix navigation highlighting issues. b/
28560594 b/
28586131
Change-Id: I72781c9ed831e0f15689a7f4e64f5c0413c3e975
Amanda Kassay [Thu, 5 May 2016 02:31:54 +0000 (22:31 -0400)]
Update to reference templates to include resources to fix navigation highlighting issues.
b/
28560594
b/
28586131
Staged:
http://akassay.nyc.corp.google.com:8080/reference/android/Manifest.permission_group.html?tenant=android
Change-Id: I6cefa0014a308e571f88b0635f6bdae21b4276cb
Bjoern Johansson [Wed, 4 May 2016 22:09:40 +0000 (15:09 -0700)]
Indicate that all emulator images support USB
The Android framework assumes that if an app uses UsbManager then there
must be USB support on the device. In order to deal with this the
emulator has to indicate USB support. Previously this was true for
Google SDK phone images because USB support is part of the common API
packages that gets installed. For AOSP and some other build targets USB
support was not included. This change indicates support for USB for all
emulator system images.
BUG:
28088069
Change-Id: I880210e89e6ad3412bdc069d6c20ed54a52cff83
Tao Bao [Wed, 4 May 2016 22:32:38 +0000 (22:32 +0000)]
Merge "releasetools: Perform erase commands first." into nyc-dev
Tao Bao [Tue, 3 May 2016 17:02:01 +0000 (10:02 -0700)]
releasetools: Perform erase commands first.
We used to erase all the unused blocks at the end of an update. In order
to work around the eMMC issue in b/
28347095, we move part of the erase
commands, which won't be used during the update, to the beginning. The
reset would be erased at the end. This is in hopes of avoiding eMMC
getting starved for clean blocks which would otherwise fail an OTA.
Bug:
28347095
Change-Id: Ia96b06216b35d6700858687a66734af36d0ec213
smain@google.com [Wed, 4 May 2016 18:40:35 +0000 (18:40 +0000)]
Merge "remove left nav from any remaining sdk/ and tools/ pages. There are still some sdk/ pages but all tools/ pages are gone, so although we could just ignore such pages, better safe than sorry, so going to catch those too." into mnc-mr-docs am:
7204a974dc am:
a4da48a31f
am:
68d68d9f0f
* commit '
68d68d9f0f4434abb861a90bf5ff6ba5b1c98321':
remove left nav from any remaining sdk/ and tools/ pages. There are still some sdk/ pages but all tools/ pages are gone, so although we could just ignore such pages, better safe than sorry, so going to catch those too.
Change-Id: If633ef35502fb79d0735d7bf39862e2d7a715938
smain@google.com [Wed, 4 May 2016 18:37:15 +0000 (18:37 +0000)]
Merge "remove left nav from any remaining sdk/ and tools/ pages. There are still some sdk/ pages but all tools/ pages are gone, so although we could just ignore such pages, better safe than sorry, so going to catch those too." into mnc-mr-docs am:
7204a974dc
am:
a4da48a31f
* commit '
a4da48a31f52c9ea98855a2af4f5a7f9f405d13c':
remove left nav from any remaining sdk/ and tools/ pages. There are still some sdk/ pages but all tools/ pages are gone, so although we could just ignore such pages, better safe than sorry, so going to catch those too.
Change-Id: I055deb6bfb3761b0e6486cfe6b9c4c311f20e0c8
smain@google.com [Wed, 4 May 2016 18:34:11 +0000 (18:34 +0000)]
Merge "remove left nav from any remaining sdk/ and tools/ pages. There are still some sdk/ pages but all tools/ pages are gone, so although we could just ignore such pages, better safe than sorry, so going to catch those too." into mnc-mr-docs
am:
7204a974dc
* commit '
7204a974dc4b040bf91b41d59684d1831301a0d5':
remove left nav from any remaining sdk/ and tools/ pages. There are still some sdk/ pages but all tools/ pages are gone, so although we could just ignore such pages, better safe than sorry, so going to catch those too.
Change-Id: I17c4f49dbf47fec3421e5d1f780b0100289f6d5c
Scott Main [Wed, 4 May 2016 18:31:39 +0000 (18:31 +0000)]
Merge "remove left nav from any remaining sdk/ and tools/ pages. There are still some sdk/ pages but all tools/ pages are gone, so although we could just ignore such pages, better safe than sorry, so going to catch those too." into mnc-mr-docs
Andrew Solovay [Wed, 4 May 2016 18:22:51 +0000 (18:22 +0000)]
doc: Changed go/ category etc. to topic/ am:
36af4d4d08 am:
dae70906a5
am:
fd017785eb
* commit '
fd017785eb412e0a754de9104391274b084a93f0':
doc: Changed go/ category etc. to topic/
Change-Id: I1b686880d3a376b991dadd84f7ee0a07633aef64
Andrew Solovay [Wed, 4 May 2016 18:19:08 +0000 (18:19 +0000)]
doc: Changed go/ category etc. to topic/ am:
36af4d4d08
am:
dae70906a5
* commit '
dae70906a53c692daee4d3ae92efe2166a01fec2':
doc: Changed go/ category etc. to topic/
Change-Id: I5356efde244ffdb17b65199689a8e9255724bd7e
Andrew Solovay [Wed, 4 May 2016 18:16:25 +0000 (18:16 +0000)]
doc: Changed go/ category etc. to topic/
am:
36af4d4d08
* commit '
36af4d4d084f787ebaeb48de1cd059a028f9c090':
doc: Changed go/ category etc. to topic/
Change-Id: I144632b43c6fdc34a83f61e5945bf496b42bc7e0
smain@google.com [Wed, 4 May 2016 17:19:00 +0000 (10:19 -0700)]
remove left nav from any remaining sdk/ and tools/ pages.
There are still some sdk/ pages but all tools/ pages are gone,
so although we could just ignore such pages, better safe than sorry,
so going to catch those too.
Change-Id: Iaa16fcbf88db39f38b8d5f0dee5f8ab068664f3c
Andrew Solovay [Tue, 3 May 2016 19:20:21 +0000 (12:20 -0700)]
doc: Changed go/ category etc. to topic/
Per instructions from DD and JF, changing the top-level go/
directory to topic/ ; as a result, I'm going into AK's recent CLs
(in which she added infrastructure for the new go/ directory)
and changing those too.
See first comment for doc stage location.
bug:
28558659
Change-Id: Iaa10f1a9f7477b00f6bfaa748039d146dfb292fe
Amanda Kassay [Tue, 3 May 2016 22:24:23 +0000 (22:24 +0000)]
Update path to be absolute instead of relative am:
6da868246b am:
bd5a129e00
am:
cb380fcbe3
* commit '
cb380fcbe35399226b51055bdffc38b2952a557d':
Update path to be absolute instead of relative
Change-Id: I911f81de6c66d0827ab9b0571599d1a13582025e
Amanda Kassay [Tue, 3 May 2016 22:22:03 +0000 (22:22 +0000)]
Update path to be absolute instead of relative am:
6da868246b
am:
bd5a129e00
* commit '
bd5a129e0092cbecfa29c970d9055302b9596961':
Update path to be absolute instead of relative
Change-Id: Ieab3056e0f5531a6556a8d49e6b50dd1f2a88c82
Amanda Kassay [Tue, 3 May 2016 22:19:37 +0000 (22:19 +0000)]
Update path to be absolute instead of relative
am:
6da868246b
* commit '
6da868246bb4714af31eda7fae4b59ba2b4f740c':
Update path to be absolute instead of relative
Change-Id: I8e4a160abf7ef9c70dea425ac1dcc6f339aa08c9
Amanda Kassay [Tue, 3 May 2016 22:06:14 +0000 (18:06 -0400)]
Update path to be absolute instead of relative
Staged:
http://akassay.nyc.corp.google.com:8080/reference/packages.html?tenant=android
b/
28560594
Change-Id: I7a13aebf0932a8a37fcc09bad4dcbe4cc5252bb3
Amanda Kassay [Tue, 3 May 2016 20:09:51 +0000 (20:09 +0000)]
Moving preview as a top level category so changing top category from develop to preview am:
cb8ddc56e5 am:
e11fd46903
am:
cece14c2bc
* commit '
cece14c2bc393bfe2deb99c3593e7c6424fd05d3':
Moving preview as a top level category so changing top category from develop to preview
Change-Id: Ie68a233c418e93db7be4a9fc02cc0a1346aefcaf
Amanda Kassay [Tue, 3 May 2016 20:07:22 +0000 (20:07 +0000)]
Moving preview as a top level category so changing top category from develop to preview am:
cb8ddc56e5
am:
e11fd46903
* commit '
e11fd46903a2e450f15e469cf3ec4a17da22825f':
Moving preview as a top level category so changing top category from develop to preview
Change-Id: I4f0b2af875bdc6eb93bfa568a735e7f63470a12b
Amanda Kassay [Tue, 3 May 2016 20:05:01 +0000 (20:05 +0000)]
Moving preview as a top level category so changing top category from develop to preview
am:
cb8ddc56e5
* commit '
cb8ddc56e5f3ef5308257a87195aee2a743ec083':
Moving preview as a top level category so changing top category from develop to preview
Change-Id: Ifaf1a0e788fa74137f929cd0b8a9c5b2f1787629
Amanda Kassay [Tue, 3 May 2016 19:52:06 +0000 (15:52 -0400)]
Moving preview as a top level category so changing top category from develop to preview
Change-Id: I30f97904f078b7730e12aece36343ed1a03c6cbe
Todd Kennedy [Tue, 3 May 2016 16:11:38 +0000 (16:11 +0000)]
Revert "Revert "Add shim app for CTS testing""
This reverts commit
31003c48c12201a914c68c0a15053a6a8bf5b1c3.
Bug:
28398205
Change-Id: Ia884957e224f46157af31814c32c5e0e1a33b7b8
Tao Bao [Tue, 3 May 2016 15:01:19 +0000 (08:01 -0700)]
releasetools: Change the base_fs assertion into warnings.
commit
f54216f29238a67aad1199a0e85d09e443740bf0 packed the base_fs files
into target_files.zip and added assertion to ensure the existence of the
files. We don't want to fail the OTA generation for the target_files.zip
without the base_fs files. Change the assertion into warnings instead.
Bug:
28547368
Change-Id: I6fd758a0a4fdfff02d1640fa46cf43d971627e26
Todd Kennedy [Mon, 2 May 2016 23:56:36 +0000 (23:56 +0000)]
Merge "Revert "Add shim app for CTS testing"" into nyc-dev
Todd Kennedy [Mon, 2 May 2016 23:54:08 +0000 (23:54 +0000)]
Revert "Add shim app for CTS testing"
Build errors when trying to dex2oat the CtsShim prebuilt even though it's marked with "hasCode=false".
This reverts commit
d987a11126e9c6d58cf02137971e424eb0a735da.
Change-Id: If47b3bcd4c727da7acd9068c02f8fb671ed0ae84
Todd Kennedy [Mon, 2 May 2016 22:49:53 +0000 (22:49 +0000)]
Merge "Add shim app for CTS testing" into nyc-dev
smain@google.com [Mon, 2 May 2016 22:30:44 +0000 (15:30 -0700)]
resolve merge conflicts of
bfa0fff to nyc-dev
Change-Id: Ibcb549cbb578bb1aa2347a63df0420d65272586e
smain@google.com [Mon, 2 May 2016 21:41:35 +0000 (21:41 +0000)]
remove the sdk download tables. No longer used now that downloads are in the /studio docs. am:
6f0ed9bddd
am:
56c09c5e6e
* commit '
56c09c5e6e9095c9a7b3e4387a81ce1fd2ea1145':
remove the sdk download tables. No longer used now that downloads are in the /studio docs.
Change-Id: I362d830a6ecbe48e99cd0cf77d6d52136fa15a94
smain@google.com [Mon, 2 May 2016 21:36:38 +0000 (21:36 +0000)]
remove the sdk download tables. No longer used now that downloads are in the /studio docs.
am:
6f0ed9bddd
* commit '
6f0ed9bddd6457b358f662a2d1657686f633f903':
remove the sdk download tables. No longer used now that downloads are in the /studio docs.
Change-Id: I64df6648f49943177192ea7cd27139b9b21d29ea
smain@google.com [Mon, 2 May 2016 21:18:31 +0000 (14:18 -0700)]
remove the sdk download tables. No longer used now that downloads are in the /studio docs.
Change-Id: I19524f58c2bcbfc5abdc79c60b16a259b526801b
TreeHugger Robot [Mon, 2 May 2016 19:54:49 +0000 (19:54 +0000)]
Merge "Added bugreportz binary." into nyc-dev
Felipe Leme [Mon, 2 May 2016 18:18:07 +0000 (11:18 -0700)]
Added bugreportz binary.
BUG:
28479946
Change-Id: Ic0d1b6598867ccbbc65f3fdc0d32cac7c53128a3
Tao Bao [Tue, 29 Mar 2016 22:12:37 +0000 (15:12 -0700)]
Pack base_fs files into target_files.zip.
Pack the base_fs files ({system,vendor}.map) into target_files.zip,
which would be needed when rebuilding the images at signing.
Reset the base_fs paths to point to the files in META/.
Also add blk_alloc_to_base_fs into otatools.zip.
Bug:
27698960
Change-Id: If4eb274b3f3d839c4365624f46f0dc89bd2fa440
Dirk Dougherty [Fri, 29 Apr 2016 23:54:12 +0000 (23:54 +0000)]
Merge "Generate reference nav to _book.yaml for devsite builds." into mnc-mr-docs am:
dc55c97296 am:
16c30a64a6
am:
f1929d419b
* commit '
f1929d419b5ac003d50e4a2efc18bbeadf81245b':
Generate reference nav to _book.yaml for devsite builds.
Change-Id: Ifda2c3062588bfb8205e59dfcc3d909a62334ddc
Elliot Waite [Fri, 29 Apr 2016 23:52:00 +0000 (23:52 +0000)]
Merge "Generate reference nav to _book.yaml for devsite builds." into mnc-mr-docs am:
dc55c97296
am:
16c30a64a6
* commit '
16c30a64a66aa141822df3d77277050cf4271524':
Generate reference nav to _book.yaml for devsite builds.
Change-Id: I905d220aef6137863a16556ed24fbf6d14788f7d
Dirk Dougherty [Fri, 29 Apr 2016 23:49:43 +0000 (23:49 +0000)]
Merge "Generate reference nav to _book.yaml for devsite builds." into mnc-mr-docs
am:
dc55c97296
* commit '
dc55c97296b0cc7d50d56013d417444c9b012ce2':
Generate reference nav to _book.yaml for devsite builds.
Change-Id: Id90b7d082e780530943f2a9e25f42edbc634658d
Elliot Waite [Fri, 29 Apr 2016 23:42:15 +0000 (23:42 +0000)]
Merge "Generate reference nav to _book.yaml for devsite builds." into mnc-mr-docs
Dirk Dougherty [Fri, 29 Apr 2016 23:13:06 +0000 (16:13 -0700)]
Generate reference nav to _book.yaml for devsite builds.
Change-Id: Iea0e1031b0d757664b8994096010dd92b98ca883
Adam Lesinski [Fri, 29 Apr 2016 22:09:00 +0000 (22:09 +0000)]
Merge "Call aapt2 link with argument-list" into nyc-dev
Todd Kennedy [Fri, 29 Apr 2016 20:59:04 +0000 (20:59 +0000)]
Merge "Only align when necessary" into nyc-dev
Todd Kennedy [Fri, 29 Apr 2016 14:32:00 +0000 (07:32 -0700)]
Only align when necessary
Bug:
27887819
Change-Id: Ie8b5ca31cc1c08943588fc6039d75190ff7eeb8b
Amanda Kassay [Fri, 29 Apr 2016 18:58:40 +0000 (18:58 +0000)]
Merge "Adding top category, subcategory and book path detection for go/libraries" into mnc-mr-docs am:
5b005e1ded am:
e0b5cb8f29
am:
532e0accaa
* commit '
532e0accaa91468550ce0ddc375629618e8873c2':
Adding top category, subcategory and book path detection for go/libraries
Change-Id: I1264c52ce1a3329ee54565ba14a412144d229647
Amanda Kassay [Fri, 29 Apr 2016 18:56:25 +0000 (18:56 +0000)]
Merge "Adding top category, subcategory and book path detection for go/libraries" into mnc-mr-docs am:
5b005e1ded
am:
e0b5cb8f29
* commit '
e0b5cb8f297c24a58382baa41d006783c61afd35':
Adding top category, subcategory and book path detection for go/libraries
Change-Id: I2132c0e0e52a0659874e495ac852e037ada17036
Amanda Kassay [Fri, 29 Apr 2016 18:54:12 +0000 (18:54 +0000)]
Merge "Adding top category, subcategory and book path detection for go/libraries" into mnc-mr-docs
am:
5b005e1ded
* commit '
5b005e1ded3a7c857fa326811e4cc197f394dab3':
Adding top category, subcategory and book path detection for go/libraries
Change-Id: Id9274c4d464a42f54f5e6c53ede396e7060e773e
Amanda Kassay [Fri, 29 Apr 2016 18:44:25 +0000 (18:44 +0000)]
Merge "Adding top category, subcategory and book path detection for go/libraries" into mnc-mr-docs
smain@google.com [Fri, 29 Apr 2016 16:40:05 +0000 (16:40 +0000)]
add studio survey button to header. am:
075aad742a am:
1e5a77656d am:
5b21ac836b
am:
0fbdef286c
* commit '
0fbdef286c3d75c46f6cfe8222a02f23fe71eada':
add studio survey button to header.
Change-Id: I0c30340254f078958a4d87a4a6368673fb8978d2
Amanda Kassay [Wed, 27 Apr 2016 19:01:21 +0000 (15:01 -0400)]
Adding top category, subcategory and book path detection for go/libraries
Fix for sdk download form b/
28425669
Fix for missing 'Develop' text in left nav on preview pages b/
28450858
Change-Id: I0b7a5dc26dc3cb4be58aecbbad41cdf62e0331ba
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:37:23 +0000 (16:37 +0000)]
add studio survey button to header. am:
075aad742a am:
1e5a77656d
am:
5b21ac836b
* commit '
5b21ac836b99141e460b5426c8781dddc9987439':
add studio survey button to header.
Change-Id: Iaff1610a9fdc0eb64cabb09bd151a81896d2e065
smain@google.com [Fri, 29 Apr 2016 16:34:58 +0000 (16:34 +0000)]
add studio survey button to header. am:
075aad742a
am:
1e5a77656d
* commit '
1e5a77656d6edc39f5cc61e118edd78a0c99b1d8':
add studio survey button to header.
Change-Id: I5deb51962a013dbc895c87a64be2f2c7c0a9ca4e
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:
075aad742a
* commit '
075aad742a9d12d43435e7b909a6a999c1050f6c':
add studio survey button to header.
Change-Id: I82c20a411335126acfcca8773aab51eb142b213d
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
(cherry picked from commit
f887aec708426ca4f6dbb1def25b006813979e42)
Todd Kennedy [Wed, 30 Mar 2016 16:56:08 +0000 (09:56 -0700)]
Add shim app for CTS testing
We need a shim application on the system partition that we can upgrade
during CTS tests.
Bug:
27450489
Change-Id: I32a72dc5110cedd466cdee2607965c705f7aa6d3
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 [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: I971e23505f766a2192469df1aad55bc20c46f618
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
OSDN Git Service
