Tao Bao
02c87a01d9
am 3b409d56
: am dae6455c
: Merge "Add an option to include a full bootloader in incremental OTA."
...
* commit '3b409d56f4e142dd4afc7e11bbe4502123a46f31':
Add an option to include a full bootloader in incremental OTA.
2015-08-17 18:29:32 +00:00
Tao Bao
3b409d56f4
am dae6455c
: Merge "Add an option to include a full bootloader in incremental OTA."
...
* commit 'dae6455c95a30ec2742b54ce3c8a4a45b1aa65f2':
Add an option to include a full bootloader in incremental OTA.
2015-08-17 17:48:43 +00:00
Tao Bao
dae6455c95
Merge "Add an option to include a full bootloader in incremental OTA."
2015-08-17 17:38:01 +00:00
leozwang
aa6c1a1445
Add an option to include a full bootloader in incremental OTA.
...
Bug: 23101469
Change-Id: Iac466b83f789f10d26e8d289dce766cf0d05148b
(cherry picked from commit c1324751e79b23a63ea494f4bc784446c8f32435)
2015-08-17 10:34:01 -07:00
Dirk Dougherty
a4f8444796
am 23a7114f
: am 3de73270
: am 8ea2636c
: am 6a8f88cd
: adjust image placement for m hero on medium screens.
...
* commit '23a7114fbb605d582a3451f522b9d1f6ec0b2741':
adjust image placement for m hero on medium screens.
2015-08-17 00:19:08 +00:00
Dirk Dougherty
23a7114fbb
am 3de73270
: am 8ea2636c
: am 6a8f88cd
: adjust image placement for m hero on medium screens.
...
* commit '3de7327062f452f3489e04aeb07b43efed32764f':
adjust image placement for m hero on medium screens.
2015-08-17 00:13:21 +00:00
Dirk Dougherty
3de7327062
am 8ea2636c
: am 6a8f88cd
: adjust image placement for m hero on medium screens.
...
* commit '8ea2636c190789263aaf78b89163c8e85bef3417':
adjust image placement for m hero on medium screens.
2015-08-17 00:06:12 +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
Stephen Hines
361d2d0f54
am 5d17a7e2
: am 2e08cb6e
: Merge "Add -mfpu=neon-vfpv4 if cpu is krait"
...
* commit '5d17a7e2adf505fd7a97782f54856c86a237369d':
Add -mfpu=neon-vfpv4 if cpu is krait
2015-08-15 02:19:08 +00:00
Yang Ni
5ed8b24fd4
am dcfb0c80
: am 36600a6b
: Merge "Include target api version in build system for rscpp."
...
* commit 'dcfb0c8018ec9e81fa79f3251a3d49a4cc90ddf4':
Include target api version in build system for rscpp.
2015-08-15 02:19:06 +00:00
Stephen Hines
5d17a7e2ad
am 2e08cb6e
: Merge "Add -mfpu=neon-vfpv4 if cpu is krait"
...
* commit '2e08cb6e1bf90b0950c875132d2bf37b71d03fbb':
Add -mfpu=neon-vfpv4 if cpu is krait
2015-08-15 02:12:46 +00:00
Stephen Hines
2e08cb6e1b
Merge "Add -mfpu=neon-vfpv4 if cpu is krait"
2015-08-15 02:04:55 +00:00
Yang Ni
dcfb0c8018
am 36600a6b
: Merge "Include target api version in build system for rscpp."
...
* commit '36600a6bf9b3b79327785cd740a909d3920d6519':
Include target api version in build system for rscpp.
2015-08-14 18:46:18 +00:00
Yang Ni
36600a6bf9
Merge "Include target api version in build system for rscpp."
2015-08-14 18:39:47 +00:00
Joe Fernandez
8e8a8d75b6
am e491aea7
: am 251d0ad1
: am a2869db8
: am 71e0a80c
: Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev
...
* commit 'e491aea79d8bfb2dafe8e6dc8af6f5a326617e0b':
doc change: Add hero image for m and css for landing pages.
2015-08-14 03:18:27 +00:00
Dan Albert
5256b245a9
am 5e9f4912
: am 578acca4
: Merge "Link librt on the host when using sanitizers."
...
* commit '5e9f491218721adecfab6ea0178cd1e4c6723a87':
Link librt on the host when using sanitizers.
2015-08-14 01:10:59 +00:00
Dan Albert
5e9f491218
am 578acca4
: Merge "Link librt on the host when using sanitizers."
...
* commit '578acca4e27511900eefc2f65be3e88f9127660c':
Link librt on the host when using sanitizers.
2015-08-14 01:05:03 +00:00
Dan Albert
578acca4e2
Merge "Link librt on the host when using sanitizers."
2015-08-14 00:59:52 +00:00
Dan Albert
2922411446
Link librt on the host when using sanitizers.
...
The sanitizers now use shared memory.
Change-Id: Ie8fa6690374eda08ee4138b68fd628ebbfa2d0c8
2015-08-13 17:25:10 -07:00
Noah Presler
4796a8c524
Include target api version in build system for rscpp.
...
b/23161320
Change-Id: Ibc23309abed092e7648168fbf4b80891a44929a6
2015-08-13 17:07:56 -07:00
Joe Fernandez
e491aea79d
am 251d0ad1
: am a2869db8
: am 71e0a80c
: Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev
...
* commit '251d0ad1914e958044ecbd7d9bad86d8e446ddd3':
doc change: Add hero image for m and css for landing pages.
2015-08-13 23:23:14 +00:00
Joe Fernandez
251d0ad191
am a2869db8
: am 71e0a80c
: Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev
...
* commit 'a2869db89eb59e57b7f0cdfc5e526d5257b95ecc':
doc change: Add hero image for m and css for landing pages.
2015-08-13 23:15:45 +00: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
Tao Bao
db1f93efef
am 3a2e91ca
: am 8765fca2
: Merge "Free the stash after its use in BBOTA v2."
...
* commit '3a2e91cad7ec1309c07e9d96d572c6a0bed52346':
Free the stash after its use in BBOTA v2.
2015-08-13 22:34:12 +00:00
Tao Bao
3a2e91cad7
am 8765fca2
: Merge "Free the stash after its use in BBOTA v2."
...
* commit '8765fca2f6013fe9d82ff00729089c98921bfb52':
Free the stash after its use in BBOTA v2.
2015-08-13 22:26:17 +00:00
Tao Bao
8765fca2f6
Merge "Free the stash after its use in BBOTA v2."
2015-08-13 22:22:16 +00:00
Tao Bao
bb625d2099
Free the stash after its use in BBOTA v2.
...
In BBOTA v2, the stash size computation is inaccurate. A stash will be
used only once, so we deduct its size from stashed_blocks right after
its use. However, the stash doesn't actually get freed until being
overwritten by another stash or destroyed at the end of an update. This
leads to OTA failures due to insufficient space on /cache. This CL
changes the BBOTA v2 script to generate an explicit free right after
its use.
Bug: 23119955
Change-Id: Icdd8352bb0ff778945937c870990a888c7a4d38b
2015-08-13 14:44:38 -07: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
6474b69760
am 795c7aad
: am 1fd599cb
: am 98c570ab
: am 743938fb
: Merge "Make sure only AppCompat (not it\'s tests) are in the docs" into mnc-dev
...
* commit '795c7aad8ce948e2f94f0975abddffc7dd6c1aeb':
Make sure only AppCompat (not it's tests) are in the docs
2015-08-13 18:00:05 +00:00
Chris Banes
795c7aad8c
am 1fd599cb
: am 98c570ab
: am 743938fb
: Merge "Make sure only AppCompat (not it\'s tests) are in the docs" into mnc-dev
...
* commit '1fd599cbaeac173245dfb675a28c27bf3fcb2eca':
Make sure only AppCompat (not it's tests) are in the docs
2015-08-13 17:50:20 +00:00
Chris Banes
1fd599cbae
am 98c570ab
: am 743938fb
: Merge "Make sure only AppCompat (not it\'s tests) are in the docs" into mnc-dev
...
* commit '98c570abb2baf6f1b34a2220233257ad903f1de0':
Make sure only AppCompat (not it's tests) are in the docs
2015-08-13 17:41:38 +00: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
Dan Albert
f749e769bc
am 2c00d629
: am 727b462a
: Merge "Never allow -w."
...
* commit '2c00d62940e7f88b2168ccf3a29a1d3e84f59bfa':
Never allow -w.
2015-08-13 17:02:15 +00:00
Dan Albert
2c00d62940
am 727b462a
: Merge "Never allow -w."
...
* commit '727b462a92635665ce636c63123078a970654480':
Never allow -w.
2015-08-13 16:52:55 +00:00
Dan Albert
727b462a92
Merge "Never allow -w."
2015-08-13 16:48:18 +00:00
Mike Dodd
742463b30f
am 689c097e
: am 148839b2
: am 17b06910
: am 5bf35d06
: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
...
* commit '689c097eb3ad838f18fd13493cc0d73260f1137e':
Include new AOSP messaging app in base AOSP telephony builds.
2015-08-13 15:43:39 +00:00
Mike Dodd
689c097eb3
am 148839b2
: am 17b06910
: am 5bf35d06
: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
...
* commit '148839b275619d89e3572668dbb54012117ef78b':
Include new AOSP messaging app in base AOSP telephony builds.
2015-08-13 15:36:17 +00:00
Mike Dodd
148839b275
am 17b06910
: am 5bf35d06
: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
...
* commit '17b069107654c04f0ec2cc44d54da3a44006c710':
Include new AOSP messaging app in base AOSP telephony builds.
2015-08-13 15:30:09 +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
Neil Fuller
9354dbac7e
am 5f198440
: am bc7680c4
: Merge "Include the okhttp.jar when compiling against internal classes"
...
* commit '5f19844067af27906828af7caed8e8b9c09cac4a':
Include the okhttp.jar when compiling against internal classes
2015-08-13 10:51:27 +00:00
Neil Fuller
5f19844067
am bc7680c4
: Merge "Include the okhttp.jar when compiling against internal classes"
...
* commit 'bc7680c4d7a94cfafcc3c925f0fbf134bc1dfcb8':
Include the okhttp.jar when compiling against internal classes
2015-08-13 10:46:46 +00:00
Neil Fuller
bc7680c4d7
Merge "Include the okhttp.jar when compiling against internal classes"
2015-08-13 10:40:39 +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
68e0bbf998
am 59a76529
: am 6ff3e53f
: am 897f3ba8
: am 25abc5a3
: Merge "Fix issie #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit '59a7652985c6e49478348c6643b491275f1dc8f3':
Fix issie #23116383 : Include security patch level in Settings
2015-08-13 01:18:07 +00:00
Dianne Hackborn
59a7652985
am 6ff3e53f
: am 897f3ba8
: am 25abc5a3
: Merge "Fix issie #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit '6ff3e53faaab66975674e16a1822d926c529bc5d':
Fix issie #23116383 : Include security patch level in Settings
2015-08-13 01:09:07 +00:00
Dianne Hackborn
6ff3e53faa
am 897f3ba8
: am 25abc5a3
: Merge "Fix issie #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit '897f3ba8b1cc402fca16720be345ba9c587c326b':
Fix issie #23116383 : Include security patch level in Settings
2015-08-13 01:02:21 +00:00