Tao Bao
d3a79db8fe
am afc5ab39: am c6e087ad: resolved conflicts for merge of 2bcfbe7e to lmp-mr1-ub-dev
...
* commit 'afc5ab39d84e9fc5fecbcd3c5a77fe4f956ff825':
add otatools-package target
2015-08-25 23:39:51 +00:00
Tao Bao
afc5ab39d8
am c6e087ad: resolved conflicts for merge of 2bcfbe7e to lmp-mr1-ub-dev
...
* commit 'c6e087adc420ca08bfea8613c07aa51e1b4a2e3e':
add otatools-package target
2015-08-25 23:30:14 +00:00
Tao Bao
c6e087adc4
resolved conflicts for merge of 2bcfbe7e to lmp-mr1-ub-dev
...
Change-Id: Ia53581aee207b0a24807767d7e80959a4fc9aff3
2015-08-25 16:18:01 -07:00
Konstantinos Menychtas
3b8b865734
am ca19158e: am e9a8f465: (-s ours) resolved conflicts for merge of 0287a8f6 to lmp-mr1-ub-dev
...
* commit 'ca19158e034d6e0f5a605698c0f303893a2b9248':
Increasing all emulator system image sizes
2015-08-25 18:31:01 +00:00
Konstantinos Menychtas
ca19158e03
am e9a8f465: (-s ours) resolved conflicts for merge of 0287a8f6 to lmp-mr1-ub-dev
...
* commit 'e9a8f465859137ba37786031b804864205900cb4':
Increasing all emulator system image sizes
2015-08-25 18:22:28 +00:00
Konstantinos Menychtas
e9a8f46585
resolved conflicts for merge of 0287a8f6 to lmp-mr1-ub-dev
...
Change-Id: I1c5e60988d95e8ee73fb4cee632750ecb69b81f5
2015-08-25 17:26:22 +00:00
Doug Zongker
2bcfbe7e88
am 32bf3f32: add otatools-package target
...
* commit '32bf3f32651ddff9ffa2168017d71ec4b151a0a9':
add otatools-package target
2015-08-25 01:20:34 +00:00
Doug Zongker
32bf3f3265
add otatools-package target
...
Add a target to zip up all the otatools and releasetools, for easy
copying to the OTA builder machine.
Change-Id: I55a6d93c1de75ac936d941c0e3ae72897407f563
(cherry picked from commit f22b0f43ef )
2015-08-24 15:43:40 -07:00
smain@google.com
15bb28fc73
am ed7e864a: fix a few bugs in the studio download button behavior: - make button text always white (avoid blue on blue during hover) - revise logic to add the platform name to download button to avoid weird duplicity bug on small screens - remove the animation scr
...
* commit 'ed7e864a735f004f1dbb4a2db5261855b5693913':
fix a few bugs in the studio download button behavior: - make button text always white (avoid blue on blue during hover) - revise logic to add the platform name to download button to avoid weird duplicity bug on small screens - remove the animation script when clicking download before agree because it reloaded the page (unkown cause) depends on: https://googleplex-android-review.git.corp.google.com/#/c/752757/
2015-08-24 16:41:18 +00:00
smain@google.com
ed7e864a73
fix a few bugs in the studio download button behavior:
...
- make button text always white (avoid blue on blue during hover)
- revise logic to add the platform name to download button to avoid weird duplicity bug on small screens
- remove the animation script when clicking download before agree because it reloaded the page (unkown cause)
depends on: https://googleplex-android-review.git.corp.google.com/#/c/752757/
Change-Id: I1b2b4ff9c0b0cbbd34f1c77a2b736fe3425a16e4
2015-08-20 00:52:27 +00:00
Konstantinos Menychtas
0287a8f6c5
am dae79613: Increasing all emulator system image sizes
...
* commit 'dae79613cb4deb209d3428b108535715aa364f68':
Increasing all emulator system image sizes
2015-08-18 20:19:10 +00:00
Konstantinos Menychtas
39b32b0d1f
am 956e4693: Increasing MIPS emulator system image size and user-data image size
...
* commit '956e469327b1da4b635f20795ed48f6c36ba10d6':
Increasing MIPS emulator system image size and user-data image size
2015-08-18 18:28:45 +00:00
Konstantinos Menychtas
dae79613cb
Increasing all emulator system image sizes
...
Size increase in system image deemed necessary after build
breakage observed on lmp-mr1-dev due to lack of space on
MIPS system image.
All system image sizes updated to match the image size
values set in MNC-dev (avoid merge conflicts, future-proof
all images against similar breakage issues).
This image size increase takes moderate space on host
device and does not affect system image download size
(images are sparse but delivered compressed anyway).
Change-Id: I2bdeb10f2d98030a358a9bc4249ce23c432de5bd
2015-08-18 11:18:59 -07:00
Konstantinos Menychtas
956e469327
Increasing MIPS emulator system image size and user-data image size
...
Size increase taken as a precaution against recent built breakage
due to lack of space on a number of targets (e.g. x86, ARM64).
System and user-data image sizes set to match currently most common
setup for the emulator: system image: 1.25gb, user-data image 700mb.
Change-Id: I7118eb26dd78f5fa9e4f0006e15c8d47dee8e28c
2015-08-18 17:34:09 +00:00
Dirk Dougherty
8ea2636c19
am 6a8f88cd: adjust image placement for m hero on medium screens.
...
* commit '6a8f88cdec931470256ade35ffe6b8097425e36f':
adjust image placement for m hero on medium screens.
2015-08-16 23:57:48 +00:00
Dirk Dougherty
6a8f88cdec
adjust image placement for m hero on medium screens.
...
Change-Id: I644837bf151549ad8dbbfb194f8e699233362933
2015-08-14 21:19:22 -07:00
Joe Fernandez
a2869db89e
am 71e0a80c: Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev
...
* commit '71e0a80c2c2fdc26bb014685eebb874aa40f782d':
doc change: Add hero image for m and css for landing pages.
2015-08-13 23:11:45 +00:00
Joe Fernandez
71e0a80c2c
Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev
2015-08-13 23:02:37 +00:00
Dirk Dougherty
083da20347
doc change: Add hero image for m and css for landing pages.
...
Change-Id: I52ddba716eebf821f8f5dbd888d6e3519f4284d4
2015-08-13 12:37:34 -07:00
Chris Banes
98c570abb2
am 743938fb: Merge "Make sure only AppCompat (not it\'s tests) are in the docs" into mnc-dev
...
* commit '743938fb0d4f56d7d009486fb90891eab9b50897':
Make sure only AppCompat (not it's tests) are in the docs
2015-08-13 17:36:49 +00:00
Chris Banes
743938fb0d
Merge "Make sure only AppCompat (not it's tests) are in the docs" into mnc-dev
2015-08-13 17:28:32 +00:00
Mike Dodd
17b0691076
am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
...
* commit '5bf35d0685ba62ded55cc63f3dd2f23b82cc645d':
Include new AOSP messaging app in base AOSP telephony builds.
2015-08-13 15:22:44 +00:00
Mike Dodd
5bf35d0685
Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
2015-08-13 15:16:38 +00:00
Chris Banes
b916a5bcbc
Make sure only AppCompat (not it's tests) are in the docs
...
BUG: 23169683
Change-Id: I6ab3b8c89eba17920f1265021c7960819e4371ab
2015-08-13 10:42:02 +01:00
Dianne Hackborn
897f3ba8b1
am 25abc5a3: Merge "Fix issie #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit '25abc5a38e2e7f2962463aa4e5cd407ecdde689c':
Fix issie #23116383 : Include security patch level in Settings
2015-08-13 00:54:30 +00:00
Dianne Hackborn
25abc5a38e
Merge "Fix issie #23116383 : Include security patch level in Settings" into mnc-dev
2015-08-13 00:46:58 +00:00
Dianne Hackborn
e593e5c42a
Fix issie #23116383 : Include security patch level in Settings
...
Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
2015-08-12 16:29:08 -07:00
Mike Dodd
f29b5bd380
Include new AOSP messaging app in base AOSP telephony builds.
...
b/23110861
Change-Id: I31ba32f3341c77ba6eb083a189dffa1a08c6c8d4
2015-08-12 15:44:04 -07:00
Ian Pedowitz
0fd879cd65
am a0372e20: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
...
* commit 'a0372e20a24283002c2d27b372194d88e1983a3f':
Removing VisualizationWallpapers as it does not comply with API 23 rules
2015-08-12 20:17:30 +00:00
Ian Pedowitz
a0372e20a2
Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
2015-08-12 19:41:54 +00:00
Mike Dodd
09baf01491
am 745d11cc: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
...
* commit '745d11ccd077060b5d3b0e3e53682e8c1f85dd66':
Revert "Include new AOSP messaging app in base builds."
2015-08-12 18:58:59 +00:00
Mike Dodd
745d11ccd0
Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
2015-08-12 18:53:47 +00:00
Mike Dodd
018500efea
Revert "Include new AOSP messaging app in base builds."
...
This reverts commit a8b0905e16 .
Change-Id: Ia8b8eaf6576937907b073ad97593440e114c0b6f
2015-08-12 18:48:45 +00:00
Ian Pedowitz
68c62e78ad
Removing VisualizationWallpapers as it does not comply with API 23 rules
...
Bug: 23021372
Change-Id: Ib985ac99bd9068c21f8a1c48e77c72426f69ea79
2015-08-12 11:11:55 -07:00
Mike Dodd
d95990e685
am 02389bf9: Merge "Include new AOSP messaging app in base builds." into mnc-dev
...
* commit '02389bf940f751ffb85c8c2187a7039f0c18dad1':
Include new AOSP messaging app in base builds.
2015-08-12 17:49:48 +00:00
Mike Dodd
02389bf940
Merge "Include new AOSP messaging app in base builds." into mnc-dev
2015-08-12 17:01:24 +00:00
Tao Bao
a749ea4b47
am 11cf92aa: am 1dca55fd: skip the merge of 67e7c661 to lmp-mr1-ub-dev
...
* commit '11cf92aa37b9f51176a2055b1ff97b6211404103':
Add support for clobbered blocks
2015-08-12 07:03:42 +00:00
Tao Bao
11cf92aa37
am 1dca55fd: skip the merge of 67e7c661 to lmp-mr1-ub-dev
...
* commit '1dca55fde512f1758690fb563f1ffc9cec5f7271':
Add support for clobbered blocks
2015-08-12 06:55:21 +00:00
Tao Bao
1dca55fde5
skip the merge of 67e7c661 to lmp-mr1-ub-dev
...
The change (007979ee ) was cherry-picked from mnc-dev back to
lmp-mr1-dev. It doesn't need to flow further.
Change-Id: I0469708f1f3a0863f194a5820c7aeda4d163cbb7
2015-08-11 23:22:37 -07:00
Tao Bao
67e7c66124
am 007979ee: Add support for clobbered blocks
...
* commit '007979ee7543a396d97b3e9ada21aca44d503597':
Add support for clobbered blocks
2015-08-12 05:18:37 +00:00
Tao Bao
007979ee75
Add support for clobbered blocks
...
In ext4 filesystems, some blocks might be changed even being mounted
R/O, such as the superblock (block 0). We need to exclude such blocks
from integrity verification. Plus such blocks should always be
written to the target by copying instead of patching.
Bug: http://b/20939131
Change-Id: If9efab3d7a0071a87b4d4297daf7963c3b818afe
(cherry picked from commit ff7778166b )
2015-08-11 21:02:45 -07:00
Ian Pedowitz
c055f9b51a
am e5a63158: Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev
...
* commit 'e5a631585a7b07c329f9ada04c99ed04b6c16b62':
Increasing arm(64)? emulator partition sizes to 1.5GB
2015-08-11 21:59:25 +00:00
Ian Pedowitz
e5a631585a
Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev
2015-08-11 21:54:17 +00:00
Clay Murphy
86e510cc31
am 71a33c4d: Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev
...
* commit '71a33c4d5b010757423980b90681445ca2bb2be0':
Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11 ) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
2015-08-11 21:04:24 +00:00
Clay Murphy
71a33c4d5b
Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev
2015-08-11 20:55:24 +00:00
Mike Dodd
a8b0905e16
Include new AOSP messaging app in base builds.
...
b/23110861
Change-Id: I365bedc809425c901982f867e671070344d1112b
2015-08-11 13:14:09 -07:00
Ian Pedowitz
4e0d34c7c7
Increasing arm(64)? emulator partition sizes to 1.5GB
...
Bug: 23093319
Change-Id: I5e493ef4715cee96ae6ab40d6415f5330075fad6
2015-08-11 12:53:39 -07:00
Ian Pedowitz
0150dae615
am 073f74d9: Merge "Increasing x86 emulator system partition size" into mnc-dev
...
* commit '073f74d90853b39de32308fa3eeab9aa8998bd69':
Increasing x86 emulator system partition size
2015-08-11 19:18:13 +00:00
Ian Pedowitz
073f74d908
Merge "Increasing x86 emulator system partition size" into mnc-dev
2015-08-11 19:12:28 +00:00
Ian Pedowitz
c79c7d152f
am a18c5028: Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
...
* commit 'a18c5028d77f0323b8b8959982ae7d6b1ec7aded':
Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
2015-08-11 17:41:08 +00:00