OSDN Git Service
Zach Jang [Wed, 23 Mar 2016 01:07:14 +0000 (01:07 +0000)]
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am:
175b780 am:
274e483 am:
08d9bea am:
6bbd684 am:
f32d07d
am:
0cf7987
* commit '
0cf7987b7e96d2178fbb028e36992ffb1b589b38':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
Zach Jang [Wed, 23 Mar 2016 01:03:47 +0000 (01:03 +0000)]
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am:
175b780 am:
274e483 am:
08d9bea am:
6bbd684
am:
f32d07d
* commit '
f32d07dd9328401525e333a34464a1d1f363e524':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
Zach Jang [Wed, 23 Mar 2016 01:00:15 +0000 (01:00 +0000)]
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am:
175b780 am:
274e483 am:
08d9bea
am:
6bbd684
* commit '
6bbd684464a1307f074e6c173a9147d6e2a626f1':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
Zach Jang [Wed, 23 Mar 2016 00:56:45 +0000 (00:56 +0000)]
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am:
175b780 am:
274e483
am:
08d9bea
* commit '
08d9bea41096f7c055cf67860a07436da6712b01':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
Zach Jang [Wed, 23 Mar 2016 00:53:20 +0000 (00:53 +0000)]
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am:
175b780
am:
274e483
* commit '
274e48378f92c711d28876380f34e263159cb81b':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
Zach Jang [Wed, 23 Mar 2016 00:49:48 +0000 (00:49 +0000)]
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
am:
175b780
* commit '
175b7800f484edceee404abf21973859d5793c0d':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
Zach Jang [Tue, 22 Mar 2016 00:59:40 +0000 (00:59 +0000)]
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am:
2b71be5 am:
df28b90 am:
b90d094 am:
fa24625 am:
d7bf980
am:
87582a8
* commit '
87582a8758970cc1178c9c63a7e5f8d97b02aa5d':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
Zach Jang [Tue, 22 Mar 2016 00:56:58 +0000 (00:56 +0000)]
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am:
2b71be5 am:
df28b90 am:
b90d094 am:
fa24625
am:
d7bf980
* commit '
d7bf9800f4f5fdc83b2ffb163207025459b26b36':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
Zach Jang [Tue, 22 Mar 2016 00:54:07 +0000 (00:54 +0000)]
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am:
2b71be5 am:
df28b90 am:
b90d094
am:
fa24625
* commit '
fa2462551694090da0d0c941d805165c2e2f6dc2':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
Zach Jang [Tue, 22 Mar 2016 00:51:24 +0000 (00:51 +0000)]
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am:
2b71be5 am:
df28b90
am:
b90d094
* commit '
b90d09439a5901f78e9eae332f163cdc1ff98f49':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
Zach Jang [Tue, 22 Mar 2016 00:48:45 +0000 (00:48 +0000)]
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am:
2b71be5
am:
df28b90
* commit '
df28b90a7c45a02c4ba9896ad89f745a48fac7df':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
Zach Jang [Tue, 22 Mar 2016 00:45:26 +0000 (00:45 +0000)]
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
am:
2b71be5
* commit '
2b71be536b6de0d16d0ae3224d1b00c41bec467e':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
Zach Jang [Tue, 22 Mar 2016 00:42:55 +0000 (17:42 -0700)]
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
b/
27724973
Change-Id: I572123586730e45b304f352c8b0fd6371ff5788b
Zach Jang [Fri, 18 Mar 2016 00:22:40 +0000 (00:22 +0000)]
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am:
7a498ba am:
cdbccfd am:
5b24724 am:
592d1c5 am:
bbf3687
am:
b294912
* commit '
b29491287c683eaa53f567745e3935fb88f91b2f':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
Zach Jang [Fri, 18 Mar 2016 00:20:22 +0000 (00:20 +0000)]
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am:
7a498ba am:
cdbccfd am:
5b24724 am:
592d1c5
am:
bbf3687
* commit '
bbf3687eb83878bbba380799c9f25af1b227bee6':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
Zach Jang [Fri, 18 Mar 2016 00:18:01 +0000 (00:18 +0000)]
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am:
7a498ba am:
cdbccfd am:
5b24724
am:
592d1c5
* commit '
592d1c5a46b95015ec831febc953b17b721383e9':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
Zach Jang [Fri, 18 Mar 2016 00:15:39 +0000 (00:15 +0000)]
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am:
7a498ba am:
cdbccfd
am:
5b24724
* commit '
5b24724ccf81ebbcfd20cebcb9f024c8fed3b5f2':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
Zach Jang [Fri, 18 Mar 2016 00:13:25 +0000 (00:13 +0000)]
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am:
7a498ba
am:
cdbccfd
* commit '
cdbccfda83da86eb8fd8007cc6c6ec2e59ad4223':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
Zach Jang [Fri, 18 Mar 2016 00:11:47 +0000 (17:11 -0700)]
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2
- kernel updates with patches for CVE-2015-1805
b/
27724967
Change-Id: Ie9daf35dcba3f844c925358daf2646b7ab5b5f5f
Zach Jang [Fri, 18 Mar 2016 00:10:53 +0000 (00:10 +0000)]
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
am:
7a498ba
* commit '
7a498bafff136f1996042c6794ababcaff11d600':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
Zach Jang [Fri, 18 Mar 2016 00:04:32 +0000 (17:04 -0700)]
Updating Security Patch String to: 2016-03-18
- March 2016 OTA v2
b/
27724091
Change-Id: If448a426d78388208e15254ef30b42873a729647
Tao Bao [Wed, 9 Mar 2016 05:29:30 +0000 (05:29 +0000)]
Use the update-binary in the source build for downgrade OTAs. am:
fa41fb2705
am:
7302eb7dd6
* commit '
7302eb7dd6bd22c6123bd0b252889732e215592e':
Use the update-binary in the source build for downgrade OTAs.
Tao Bao [Wed, 9 Mar 2016 05:27:36 +0000 (05:27 +0000)]
Use the update-binary in the source build for downgrade OTAs.
am:
fa41fb2705
* commit '
fa41fb27054185b3fba0519d01dabd21444fe772':
Use the update-binary in the source build for downgrade OTAs.
Tao Bao [Wed, 9 Mar 2016 01:53:39 +0000 (17:53 -0800)]
Use the update-binary in the source build for downgrade OTAs.
We used to use the update-binary from the target build when creating
incremental OTAs. But for downgrade OTAs, we should use the one in the
source build instead, which is actually newer.
Bug:
27556903
Change-Id: Ib6415729b979dbffdebdda24902f7f560942801a
(cherry picked from commit
4996cf03d2321eef56a8163c7fc73ba9976e1021)
Tao Bao [Tue, 8 Mar 2016 05:37:27 +0000 (05:37 +0000)]
resolve merge conflicts of
177c610e7f to cw-e-dev
am:
bd25fcdc02
* commit '
bd25fcdc02a94ec9f50fc431a3731484b9812e23':
DO NOT MERGE releasetools: Support generating downgrade incremental OTAs.
Tao Bao [Tue, 8 Mar 2016 05:24:40 +0000 (21:24 -0800)]
resolve merge conflicts of
177c610e7f to cw-e-dev
Change-Id: Iba7820247d0b53d7f9553290eb0db3547f31beda
Tao Bao [Tue, 23 Feb 2016 19:38:39 +0000 (11:38 -0800)]
DO NOT MERGE releasetools: Support generating downgrade incremental OTAs.
Add --downgrade flag to ota_from_target_files.py script. It allows
generating an incremental OTA that updates from a newer build to an
older one (based on timestamp comparison). "post-timestamp" line in the
metadata file will be replaced by "ota-downgrade=yes". A data wipe will
always be enforced, so "ota-wipe=yes" will also be included in the
metadata file.
Bug:
26883782
Change-Id: Iaa05f662d948b7ab632a9fbb7051cc3f8bf68c21
(cherry picked from commit
5d1825664a0fec256fa28d62aadcac96f59a41b2)
Tao Bao [Tue, 1 Mar 2016 22:56:23 +0000 (22:56 +0000)]
releasetools: Add --oem_no_mount option.
am:
df4cb0b2c1
* commit '
df4cb0b2c1e6d1cf5973e9008bd6dc15bd590ac0':
releasetools: Add --oem_no_mount option.
Tao Bao [Fri, 26 Feb 2016 03:49:55 +0000 (19:49 -0800)]
releasetools: Add --oem_no_mount option.
We may have devices with OEM-specific properties but without an OEM
partition (e.g. the properties might be set by init based on hardware
SKUs). For such devices, we supply --oem_no_mount to skip mounting the
OEM partition in the updater-script. The option is only meaningful when
-o (--oem_settings) is specified.
Bug:
27359929
Change-Id: Ic08396e478a82be4188e980e704b33b4f704a8d7
(cherry picked from commit
8608cde944d64dece63e8c770deb78c1d092c719)
Ying Wang [Wed, 24 Feb 2016 03:01:39 +0000 (03:01 +0000)]
Allow to build against Mac OS X SDK 10.11. am:
7f7c698959 am:
773b017ee9
am:
e511a07677
* commit '
e511a07677dfc8f622f5fa8863b453aad7ffcdea':
Allow to build against Mac OS X SDK 10.11.
Ying Wang [Wed, 24 Feb 2016 03:01:22 +0000 (03:01 +0000)]
Update mac_sdk_versions_supported. am:
8df3355f64 am:
0954a9d91f
am:
2114b48a14
* commit '
2114b48a14c6108d2d4d3207c2eb87d2d72ab76d':
Update mac_sdk_versions_supported.
Ying Wang [Wed, 24 Feb 2016 02:55:16 +0000 (02:55 +0000)]
Allow to build against Mac OS X SDK 10.11. am:
7f7c698959
am:
773b017ee9
* commit '
773b017ee96ace4e4bdc176dd59fc14c979736ef':
Allow to build against Mac OS X SDK 10.11.
Ying Wang [Wed, 24 Feb 2016 02:54:51 +0000 (02:54 +0000)]
Update mac_sdk_versions_supported. am:
8df3355f64
am:
0954a9d91f
* commit '
0954a9d91f8f68133150a39afc364e1ad091a19b':
Update mac_sdk_versions_supported.
Ying Wang [Wed, 24 Feb 2016 02:46:46 +0000 (02:46 +0000)]
Allow to build against Mac OS X SDK 10.11.
am:
7f7c698959
* commit '
7f7c6989590bd9395e8ebf3a01b5b4033c89d7d1':
Allow to build against Mac OS X SDK 10.11.
Ying Wang [Wed, 24 Feb 2016 02:46:36 +0000 (02:46 +0000)]
Update mac_sdk_versions_supported.
am:
8df3355f64
* commit '
8df3355f64119adb9ca71c9f2cc9b51afb61c65a':
Update mac_sdk_versions_supported.
Ying Wang [Wed, 14 Oct 2015 01:00:45 +0000 (18:00 -0700)]
Allow to build against Mac OS X SDK 10.11.
Bug:
24739158
Change-Id: I7c57e141dd02a0d2de5a7a1ccbc72ffe422a8d6f
Ying Wang [Wed, 29 Jul 2015 23:35:40 +0000 (16:35 -0700)]
Update mac_sdk_versions_supported.
Now we requires Mac OS X SDK version at least 10.8.
Also removed the unnecessary sort call in getting
mac_sdk_versions_installed.
Lexical sort doesn't make sense when 10.10 is added to that list.
Actually the next makefile line makes sure we always get the first
match in $(mac_sdk_versions_supported):
mac_sdk_version := $(firstword $(filter $(mac_sdk_versions_installed),
$(mac_sdk_versions_supported)))
Bug:
22825165
Change-Id: I4bfafabb11f94b66704d4799fe61fe3f16429538
Zach Jang [Fri, 19 Feb 2016 22:28:35 +0000 (22:28 +0000)]
Updating security string patch to 2016-04-01 am:
e182d2a95c am:
054bbb9766 am:
7e6a1633c8 am:
eb651e2e45 am:
3f53b385de
am:
fc30358acb
* commit '
fc30358acbfaa41e2c3282832ceb3607a0c2fcb9':
Updating security string patch to 2016-04-01
Zach Jang [Fri, 19 Feb 2016 22:22:57 +0000 (22:22 +0000)]
Updating security string patch to 2016-04-01 am:
e182d2a95c am:
054bbb9766 am:
7e6a1633c8 am:
eb651e2e45
am:
3f53b385de
* commit '
3f53b385dec6b45d0e4d07a29ce43b3c510b1d10':
Updating security string patch to 2016-04-01
Zach Jang [Fri, 19 Feb 2016 22:17:28 +0000 (22:17 +0000)]
Updating security string patch to 2016-04-01 am:
e182d2a95c am:
054bbb9766 am:
7e6a1633c8
am:
eb651e2e45
* commit '
eb651e2e450f1756e6acea4f570379af7d146920':
Updating security string patch to 2016-04-01
Zach Jang [Fri, 19 Feb 2016 22:11:32 +0000 (22:11 +0000)]
Updating security string patch to 2016-04-01 am:
e182d2a95c am:
054bbb9766
am:
7e6a1633c8
* commit '
7e6a1633c8ebb622271020cbb0aedae355e6501a':
Updating security string patch to 2016-04-01
Zach Jang [Fri, 19 Feb 2016 22:06:14 +0000 (22:06 +0000)]
Updating security string patch to 2016-04-01 am:
e182d2a95c
am:
054bbb9766
* commit '
054bbb9766312a2caefd5375341d49074a6d25bf':
Updating security string patch to 2016-04-01
Zach Jang [Fri, 19 Feb 2016 22:00:21 +0000 (22:00 +0000)]
Updating security string patch to 2016-04-01
am:
e182d2a95c
* commit '
e182d2a95c52e37d2a6f924c8ff386b52b08a0c9':
Updating security string patch to 2016-04-01
Zach Jang [Fri, 19 Feb 2016 21:50:29 +0000 (13:50 -0800)]
Updating security string patch to 2016-04-01
b/
27272697
Change-Id: I99c2c892a21f4c36226ea5f8d94689d6218ccf7e
Andy Huang [Wed, 13 Jan 2016 21:23:07 +0000 (21:23 +0000)]
Merge "remove Exchange2 from core.mk" into mnc-dr1.5-dev
Zach Jang [Tue, 12 Jan 2016 01:35:21 +0000 (01:35 +0000)]
Updating security patch string to 2016-03-01 am:
c24c6ccd4d am:
293887c43e am:
53e7d9bf7f am:
c9da4cce57 am:
6c61548bb7
am:
6facd249d5
* commit '
6facd249d51ffef6afa369b11041ae07733883b8':
Updating security patch string to 2016-03-01
Zach Jang [Tue, 12 Jan 2016 01:33:23 +0000 (01:33 +0000)]
Updating security patch string to 2016-03-01 am:
c24c6ccd4d am:
293887c43e am:
53e7d9bf7f am:
c9da4cce57
am:
6c61548bb7
* commit '
6c61548bb7e426704760c9351e3211fb45d67dae':
Updating security patch string to 2016-03-01
Zach Jang [Tue, 12 Jan 2016 01:30:53 +0000 (01:30 +0000)]
Updating security patch string to 2016-03-01 am:
c24c6ccd4d am:
293887c43e am:
53e7d9bf7f
am:
c9da4cce57
* commit '
c9da4cce57d387f52b675d1024459af5e73c6dbc':
Updating security patch string to 2016-03-01
Zach Jang [Tue, 12 Jan 2016 01:28:37 +0000 (01:28 +0000)]
Updating security patch string to 2016-03-01 am:
c24c6ccd4d am:
293887c43e
am:
53e7d9bf7f
* commit '
53e7d9bf7f298c438157dccc5222b7484b083d9e':
Updating security patch string to 2016-03-01
Zach Jang [Tue, 12 Jan 2016 01:26:41 +0000 (01:26 +0000)]
Updating security patch string to 2016-03-01 am:
c24c6ccd4d
am:
293887c43e
* commit '
293887c43ee5b797f8628f5983f64bf766002009':
Updating security patch string to 2016-03-01
Zach Jang [Tue, 12 Jan 2016 01:24:55 +0000 (01:24 +0000)]
Updating security patch string to 2016-03-01
am:
c24c6ccd4d
* commit '
c24c6ccd4d5de8be010b74b9021b8fdb926e1dad':
Updating security patch string to 2016-03-01
Zach Jang [Tue, 12 Jan 2016 01:12:37 +0000 (17:12 -0800)]
Updating security patch string to 2016-03-01
b/
26499556
Change-Id: I18a5ad9d8d08e2050053bcebc1a9a0c46db86733
Zach Jang [Wed, 9 Dec 2015 23:13:05 +0000 (23:13 +0000)]
DO NOT MERGE - Update security string to 2016-02-01 am:
929a4abd2b am:
af970fb308 am:
41846b0063 -s ours am:
db4d57a84c am:
02115bf55a
am:
4c51cd1a9b
* commit '
4c51cd1a9b5c41e4092aef7c5fb4cc0364873a2c':
DO NOT MERGE - Update security string to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 23:09:34 +0000 (23:09 +0000)]
DO NOT MERGE - Update security string to 2016-02-01 am:
929a4abd2b am:
af970fb308 am:
41846b0063 -s ours am:
db4d57a84c
am:
02115bf55a
* commit '
02115bf55a840790bbbca3c452a85bc97381522a':
DO NOT MERGE - Update security string to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 23:06:44 +0000 (23:06 +0000)]
DO NOT MERGE - Update security string to 2016-02-01 am:
929a4abd2b am:
af970fb308 am:
41846b0063 -s ours
am:
db4d57a84c
* commit '
db4d57a84c8f0f6b51d9b69c2e0ec3ac825270c0':
DO NOT MERGE - Update security string to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 23:03:18 +0000 (23:03 +0000)]
DO NOT MERGE - Update security string to 2016-02-01 am:
929a4abd2b am:
af970fb308
am:
41846b0063 -s ours
* commit '
41846b00633d3eba58193565c8f6c213006cea5d':
DO NOT MERGE - Update security string to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 23:03:18 +0000 (15:03 -0800)]
Update Security String to 2016-02-01 am:
f0f73c06e2 am:
5e2b003a11
am:
8b5be4dd4f
* commit '
8b5be4dd4f50266362f689d4c8f7d20fc25c5baf':
Update Security String to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 23:00:35 +0000 (23:00 +0000)]
DO NOT MERGE - Update security string to 2016-02-01 am:
929a4abd2b
am:
af970fb308
* commit '
af970fb308dd7914e8dccb56e8ea08d50e92e617':
DO NOT MERGE - Update security string to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 23:00:35 +0000 (23:00 +0000)]
Update Security String to 2016-02-01 am:
f0f73c06e2
am:
5e2b003a11
* commit '
5e2b003a116c8de6bfadf4b74d0cc676e0ed0d76':
Update Security String to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 22:57:15 +0000 (14:57 -0800)]
DO NOT MERGE - Update security string to 2016-02-01
am:
929a4abd2b
* commit '
929a4abd2b777715bc730593aee87643a30706d6':
DO NOT MERGE - Update security string to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 22:57:15 +0000 (14:57 -0800)]
Update Security String to 2016-02-01
am:
f0f73c06e2
* commit '
f0f73c06e25e17ecf8e06f42c51efac102597f57':
Update Security String to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 22:45:57 +0000 (14:45 -0800)]
DO NOT MERGE - Update security string to 2016-02-01
b/
26110717
Change-Id: Ifbb78b8c7cd5d2efa9e5501fc4e7216f336ccadc
Zach Jang [Wed, 9 Dec 2015 20:46:59 +0000 (12:46 -0800)]
Update Security String to 2016-02-01
b/
26110717
Change-Id: I1085f5d053b07c6c81d2ef22fbba5ab9157a67f2
Andy Huang [Wed, 9 Dec 2015 20:21:49 +0000 (12:21 -0800)]
remove Exchange2 from core.mk
Change-Id: I962d706d19eef5bbde3abed516d0a674ba50c1c1
Vince Harron [Tue, 24 Nov 2015 22:50:50 +0000 (22:50 +0000)]
Shorten TARGET_BRAND from generic_<arch> to Android
am:
5806531f92
* commit '
5806531f92a3670362ec8dceafd0079d51afbd18':
Shorten TARGET_BRAND from generic_<arch> to Android
Vince Harron [Thu, 29 Oct 2015 17:08:23 +0000 (10:08 -0700)]
Shorten TARGET_BRAND from generic_<arch> to Android
Switching to userdebug emulator images increased ro.build.fingerprint
Past the 91 character limit. This should bring the build server
builds under this limit.
Fixing it for local builds will be a bit more difficult.
Bug:
25829506
Change-Id: I7daee3478716adcb860cced1b770a2d00a72f1a2
(cherry picked from commit
efbeab78d3581009b3da20991a3a83d733393f45)
Zach Jang [Sat, 21 Nov 2015 01:12:28 +0000 (01:12 +0000)]
Update Security String to 2016-01-01 - DO NOT MERGE am:
58cdbdc5ad am:
645f200ae8 am:
2cd2a76c64 -s ours am:
c7b96cdd5e am:
8909bdfc4a
am:
a68c55822c
* commit '
a68c55822c115db2151b1d155566a06b01756d20':
Update Security String to 2016-01-01 - DO NOT MERGE
Zach Jang [Sat, 21 Nov 2015 01:07:24 +0000 (01:07 +0000)]
Update Security String to 2016-01-01 - DO NOT MERGE am:
58cdbdc5ad am:
645f200ae8 am:
2cd2a76c64 -s ours am:
c7b96cdd5e
am:
8909bdfc4a
* commit '
8909bdfc4abd8ffc6511c864fe968530abe40b8a':
Update Security String to 2016-01-01 - DO NOT MERGE
Zach Jang [Sat, 21 Nov 2015 01:01:49 +0000 (01:01 +0000)]
Update Security String to 2016-01-01 - DO NOT MERGE am:
58cdbdc5ad am:
645f200ae8 am:
2cd2a76c64 -s ours
am:
c7b96cdd5e
* commit '
c7b96cdd5e83ea7c62912bc779e7bc49c59023c7':
Update Security String to 2016-01-01 - DO NOT MERGE
Zach Jang [Sat, 21 Nov 2015 00:58:36 +0000 (00:58 +0000)]
Update Security String to 2016-01-01 - DO NOT MERGE am:
58cdbdc5ad am:
645f200ae8
am:
2cd2a76c64 -s ours
* commit '
2cd2a76c64dead0b057b7e9a1223f67f9a9d2e7f':
Update Security String to 2016-01-01 - DO NOT MERGE
Zach Jang [Sat, 21 Nov 2015 00:55:17 +0000 (00:55 +0000)]
Update Security String to 2016-01-01 - DO NOT MERGE am:
58cdbdc5ad
am:
645f200ae8
* commit '
645f200ae8708414d06618989328dc3e3c84a917':
Update Security String to 2016-01-01 - DO NOT MERGE
Zach Jang [Sat, 21 Nov 2015 00:55:17 +0000 (00:55 +0000)]
Update Security String to 2016-01-01 to mnc-dev am:
170459f438 am:
bcf2866fb1
am:
3ce70dfe46
* commit '
3ce70dfe467246c28290f8ca24c1f5319b46142b':
Update Security String to 2016-01-01 to mnc-dev
Zach Jang [Sat, 21 Nov 2015 00:51:39 +0000 (00:51 +0000)]
Update Security String to 2016-01-01 - DO NOT MERGE
am:
58cdbdc5ad
* commit '
58cdbdc5ad54f9c26d94860c2d0be712f88a8f07':
Update Security String to 2016-01-01 - DO NOT MERGE
Zach Jang [Sat, 21 Nov 2015 00:51:39 +0000 (00:51 +0000)]
Update Security String to 2016-01-01 to mnc-dev am:
170459f438
am:
bcf2866fb1
* commit '
bcf2866fb1ea50ea31ede70f62b864332f61b980':
Update Security String to 2016-01-01 to mnc-dev
Zach Jang [Sat, 21 Nov 2015 00:48:16 +0000 (00:48 +0000)]
Update Security String to 2016-01-01 to mnc-dev
am:
170459f438
* commit '
170459f4385d35dd991549e1b545c376ca8df281':
Update Security String to 2016-01-01 to mnc-dev
Zach Jang [Fri, 20 Nov 2015 22:37:14 +0000 (14:37 -0800)]
Update Security String to 2016-01-01 to mnc-dev
http://b/
25819582
Change-Id: Ie55f9476110b08591da05774f582a6e48ce12de7
Zach Jang [Fri, 20 Nov 2015 22:32:09 +0000 (14:32 -0800)]
Update Security String to 2016-01-01 - DO NOT MERGE
http://b/
25819582
Change-Id: I99d8ca004bb5d35613f3a2314597717f6b7c04c7
Bart Sears [Sun, 15 Nov 2015 18:02:33 +0000 (18:02 +0000)]
Revert "Change version back to 6.0" am:
55a149b740
am:
550b317688
* commit '
550b317688211118d8f2c50aaa80d2616903807b':
Revert "Change version back to 6.0"
Bart Sears [Sun, 15 Nov 2015 18:02:26 +0000 (18:02 +0000)]
Change version back to 6.0 am:
970f203b3d
am:
3a37a0cefd
* commit '
3a37a0cefd7599fa769fd86f7d64d781aaa88be7':
Change version back to 6.0
Bart Sears [Sun, 15 Nov 2015 17:59:44 +0000 (17:59 +0000)]
Revert "Change version back to 6.0"
am:
55a149b740
* commit '
55a149b74064b799efe9c69211a511725cb9925b':
Revert "Change version back to 6.0"
Bart Sears [Sun, 15 Nov 2015 17:59:32 +0000 (17:59 +0000)]
Change version back to 6.0
am:
970f203b3d
* commit '
970f203b3d3f17b778749c3ce47eb6b922aa606c':
Change version back to 6.0
Bart Sears [Sun, 15 Nov 2015 17:57:13 +0000 (17:57 +0000)]
Revert "Change version back to 6.0"
This reverts commit
970f203b3d3f17b778749c3ce47eb6b922aa606c.
Change-Id: Icd96990f128e303b0e2af5af0f0d4a0f7731fe60
Bart Sears [Sun, 15 Nov 2015 07:50:18 +0000 (23:50 -0800)]
Change version back to 6.0
Temporarily set the version back to 6.0 and security patch to
2015-11-01.
Change-Id: Idb09d6bab89362b18ae9657e3ed931d614c1894b
Vince Harron [Wed, 11 Nov 2015 19:37:38 +0000 (19:37 +0000)]
Switch emulator to generate userdebug images by default
am:
ba740ff57f
* commit '
ba740ff57fd314d0ad649c252841ab834e96fdaa':
Switch emulator to generate userdebug images by default
Vince Harron [Tue, 27 Oct 2015 23:08:25 +0000 (16:08 -0700)]
Switch emulator to generate userdebug images by default
This is primarily to avoid using the unsupported JIT on Android-M
It will increase app install times significantly because the app will
be compiled at install time. OTOH, It should improve application
performance dramatically.
Change-Id: Id1d637ec561db177fd52e4c111f4def2a1b45543
(cherry picked from commit
08787d747d71d7ff3f13d2275d937faefc6d7777)
Griff Hazen [Sun, 8 Nov 2015 01:00:58 +0000 (01:00 +0000)]
Let qemu_props service set system properties in ro.emu and ro.emulator
am:
20ed978ada
* commit '
20ed978ada07690b7ca6d643f6c8869e656ccff7':
Let qemu_props service set system properties in ro.emu and ro.emulator
Griff Hazen [Sun, 8 Nov 2015 00:44:44 +0000 (16:44 -0800)]
Let qemu_props service set system properties in ro.emu and ro.emulator
These boot properties are used by android wear emulator to configure
round and chin shaped devices.
Bug:
23324757
Change-Id: I812da02d771bba0ffc63b14459c7de7cbdeed142
Zach Jang [Tue, 27 Oct 2015 00:52:13 +0000 (00:52 +0000)]
Merge "Update security string to 2015-12-01" into mnc-dev am:
54cb940c4a am:
dfd3524f7b
am:
eca2b655e5
* commit '
eca2b655e5a57f0a13c55d815f6b18d8d03160fb':
Update security string to 2015-12-01
Zach Jang [Tue, 27 Oct 2015 00:48:30 +0000 (00:48 +0000)]
Merge "Update security string to 2015-12-01" into mnc-dev am:
54cb940c4a
am:
dfd3524f7b
* commit '
dfd3524f7b1fb2f0346eee7fa0dc42e8888f68aa':
Update security string to 2015-12-01
Zach Jang [Tue, 27 Oct 2015 00:44:56 +0000 (00:44 +0000)]
Merge "Update security string to 2015-12-01" into mnc-dev
am:
54cb940c4a
* commit '
54cb940c4a07701212e96f77ee4a89493b0f251b':
Update security string to 2015-12-01
Zach Jang [Tue, 27 Oct 2015 00:37:40 +0000 (00:37 +0000)]
Merge "Update security string to 2015-12-01" into mnc-dev
Zach Jang [Tue, 27 Oct 2015 00:02:12 +0000 (00:02 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am:
6575d4a2a8 am:
cc9ac27157 am:
fe64ce145e -s ours am:
0e8cf97670 am:
07e2c19536
am:
a3b35dec78
* commit '
a3b35dec78b8afe7e29e3d6a0fc7524b5fd846a2':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Mon, 26 Oct 2015 23:57:13 +0000 (23:57 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am:
6575d4a2a8 am:
cc9ac27157 am:
fe64ce145e -s ours am:
0e8cf97670
am:
07e2c19536
* commit '
07e2c195367119faa4645d3f9f0dcb1c6aba7396':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Mon, 26 Oct 2015 23:52:50 +0000 (23:52 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am:
6575d4a2a8 am:
cc9ac27157 am:
fe64ce145e -s ours
am:
0e8cf97670
* commit '
0e8cf97670c0b0a59d326507296829fe1bc01230':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Mon, 26 Oct 2015 23:49:22 +0000 (23:49 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am:
6575d4a2a8 am:
cc9ac27157
am:
fe64ce145e -s ours
* commit '
fe64ce145e243fb3fde5a788bcd800c2987da37c':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Mon, 26 Oct 2015 23:46:01 +0000 (23:46 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am:
6575d4a2a8
am:
cc9ac27157
* commit '
cc9ac271575b4c1ef3a2bff3fbdaf2b201c6e75d':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Mon, 26 Oct 2015 23:42:57 +0000 (23:42 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE
am:
6575d4a2a8
* commit '
6575d4a2a8c78a703e5c2e2889ecb358668d1bbd':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Thu, 22 Oct 2015 22:03:14 +0000 (15:03 -0700)]
Update security string to 2015-12-01
Change-Id: I2e07d57e457effdcf685203dabfcfefa47c70bf3
Zach Jang [Thu, 22 Oct 2015 22:00:30 +0000 (15:00 -0700)]
Update security string to 2015-12-01 - DO NOT MERGE
Change-Id: I155ec6c2b57c899f20bb85f5a5cf031499ba81b0
Ian Pedowitz [Thu, 22 Oct 2015 21:59:20 +0000 (21:59 +0000)]
Bump Android to 6.0.1 am:
0a20c942c4
am:
1f9ba9f89e
* commit '
1f9ba9f89eacd2b16805cf138df16e211b51b700':
Bump Android to 6.0.1