OSDN Git Service
The Android Automerger [Thu, 23 Jun 2016 17:45:10 +0000 (10:45 -0700)]
"MOB30R"
The Android Automerger [Tue, 14 Jun 2016 23:54:18 +0000 (16:54 -0700)]
MOB30Q
The Android Automerger [Thu, 9 Jun 2016 20:29:54 +0000 (13:29 -0700)]
"MOB30P"
The Android Automerger [Fri, 27 May 2016 18:34:22 +0000 (11:34 -0700)]
"MOB30O"
Zach Jang [Thu, 26 May 2016 23:00:38 +0000 (16:00 -0700)]
Updating security string to 2016-07-05 to release branches
b/
28912173
Change-Id: I60b28f3859f7ee006841ed4308e15404590b60bf
The Android Automerger [Thu, 26 May 2016 20:53:24 +0000 (13:53 -0700)]
"MOB30N"
The Android Automerger [Thu, 12 May 2016 20:52:10 +0000 (13:52 -0700)]
MOB30M
The Android Automerger [Wed, 4 May 2016 18:53:00 +0000 (11:53 -0700)]
"MOB30L"
The Android Automerger [Fri, 22 Apr 2016 02:11:37 +0000 (19:11 -0700)]
"MOB30K"
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
The Android Automerger [Mon, 18 Apr 2016 21:33:07 +0000 (14:33 -0700)]
"MOB30J"
The Android Automerger [Tue, 12 Apr 2016 00:36:00 +0000 (17:36 -0700)]
"MOB30I"
The Android Automerger [Fri, 8 Apr 2016 17:35:01 +0000 (10:35 -0700)]
"MOB30H"
The Android Automerger [Tue, 29 Mar 2016 22:59:28 +0000 (15:59 -0700)]
"MOB30G"
The Android Automerger [Tue, 29 Mar 2016 01:12:02 +0000 (18:12 -0700)]
"MOB30F"
The Android Automerger [Sat, 26 Mar 2016 00:48:21 +0000 (17:48 -0700)]
"MOB30E"
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
The Android Automerger [Tue, 22 Mar 2016 23:00:09 +0000 (16:00 -0700)]
MOB30D
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
Fix merge conflict to mnc-mr2-release w/ security string change to 2016-04-02
The Android Automerger [Thu, 17 Mar 2016 02:47:23 +0000 (19:47 -0700)]
MOB30C
The Android Automerger [Wed, 2 Mar 2016 03:15:31 +0000 (19:15 -0800)]
MOB30B
The Android Automerger [Sat, 27 Feb 2016 00:56:25 +0000 (16:56 -0800)]
"MOB29Z"
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
The Android Automerger [Thu, 25 Feb 2016 03:56:31 +0000 (19:56 -0800)]
MOB29Y
The Android Automerger [Wed, 24 Feb 2016 21:21:39 +0000 (13:21 -0800)]
"MOB29X"
The Android Automerger [Tue, 16 Feb 2016 20:28:52 +0000 (12:28 -0800)]
"MOB29W"
The Android Automerger [Fri, 22 Jan 2016 21:43:14 +0000 (13:43 -0800)]
"MMB29V"
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
The Android Automerger [Thu, 17 Dec 2015 21:15:30 +0000 (13:15 -0800)]
"MMB29U"
The Android Automerger [Thu, 17 Dec 2015 21:08:32 +0000 (13:08 -0800)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Wed, 16 Dec 2015 20:07:39 +0000 (12:07 -0800)]
"MMB29T"
The Android Automerger [Tue, 15 Dec 2015 21:31:36 +0000 (13:31 -0800)]
"MMB29S"
The Android Automerger [Tue, 15 Dec 2015 21:24:12 +0000 (13:24 -0800)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Tue, 15 Dec 2015 20:55:01 +0000 (12:55 -0800)]
"MMB76"
The Android Automerger [Tue, 15 Dec 2015 20:54:55 +0000 (12:54 -0800)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Fri, 11 Dec 2015 18:27:49 +0000 (10:27 -0800)]
"MMB29R"
The Android Automerger [Fri, 11 Dec 2015 00:11:59 +0000 (16:11 -0800)]
"MMB29Q"
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
The Android Automerger [Tue, 8 Dec 2015 20:35:29 +0000 (12:35 -0800)]
MMN29P
The Android Automerger [Wed, 2 Dec 2015 01:42:01 +0000 (17:42 -0800)]
"MMB29O"
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
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
The Android Automerger [Thu, 19 Nov 2015 00:31:30 +0000 (16:31 -0800)]
MMB29N
The Android Automerger [Tue, 17 Nov 2015 18:58:18 +0000 (10:58 -0800)]
"MMB29M"
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
The Android Automerger [Sun, 15 Nov 2015 19:11:16 +0000 (11:11 -0800)]
"MMB29L"
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
The Android Automerger [Wed, 11 Nov 2015 22:03:07 +0000 (14:03 -0800)]
"MMB29K"
The Android Automerger [Tue, 10 Nov 2015 04:11:33 +0000 (20:11 -0800)]
"MMB29J"
The Android Automerger [Tue, 10 Nov 2015 01:01:28 +0000 (17:01 -0800)]
"MMB29I"
The Android Automerger [Fri, 6 Nov 2015 03:24:05 +0000 (19:24 -0800)]
"MMB29H"
The Android Automerger [Fri, 6 Nov 2015 01:35:30 +0000 (17:35 -0800)]
"MMB29G"
The Android Automerger [Thu, 5 Nov 2015 01:03:11 +0000 (17:03 -0800)]
"MMB29F"
The Android Automerger [Wed, 4 Nov 2015 21:00:25 +0000 (13:00 -0800)]
"MMB29E"
The Android Automerger [Tue, 3 Nov 2015 22:35:42 +0000 (14:35 -0800)]
"MMB29D"
The Android Automerger [Mon, 2 Nov 2015 21:21:41 +0000 (13:21 -0800)]
"MMB29C"
The Android Automerger [Fri, 30 Oct 2015 02:25:14 +0000 (19:25 -0700)]
"MMB29B"
The Android Automerger [Thu, 29 Oct 2015 08:01:32 +0000 (01:01 -0700)]
"MMB29"
The Android Automerger [Thu, 29 Oct 2015 08:00:16 +0000 (01:00 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Thu, 29 Oct 2015 01:31:03 +0000 (18:31 -0700)]
bump version to MMB28B
The Android Automerger [Wed, 28 Oct 2015 08:02:09 +0000 (01:02 -0700)]
"MMB28"
The Android Automerger [Wed, 28 Oct 2015 08:00:19 +0000 (01:00 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Tue, 27 Oct 2015 08:01:43 +0000 (01:01 -0700)]
"MMB27"
The Android Automerger [Tue, 27 Oct 2015 08:00:33 +0000 (01:00 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
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 [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
The Android Automerger [Mon, 26 Oct 2015 08:02:59 +0000 (01:02 -0700)]
"MMB26"
The Android Automerger [Mon, 26 Oct 2015 08:00:12 +0000 (01:00 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Fri, 23 Oct 2015 23:14:05 +0000 (16:14 -0700)]
"MMB23"
The Android Automerger [Fri, 23 Oct 2015 23:13:14 +0000 (16:13 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Fri, 23 Oct 2015 17:12:10 +0000 (10:12 -0700)]
"MMB22C"
The Android Automerger [Thu, 22 Oct 2015 22:42:19 +0000 (15:42 -0700)]
"MMB22B"
The Android Automerger [Thu, 22 Oct 2015 22:41:44 +0000 (15:41 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
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 [Sat, 10 Oct 2015 18:00:52 +0000 (11:00 -0700)]
Bump Android to 6.0.1
Bug:
24777474
Change-Id: Ibaca3c2d583aa92c8ca998b6d380ee720b71b1b8
The Android Automerger [Thu, 22 Oct 2015 08:01:28 +0000 (01:01 -0700)]
"MMB22"
The Android Automerger [Thu, 22 Oct 2015 08:00:23 +0000 (01:00 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Wed, 21 Oct 2015 17:48:34 +0000 (10:48 -0700)]
"MMB21B"
The Android Automerger [Wed, 21 Oct 2015 17:47:22 +0000 (10:47 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Wed, 21 Oct 2015 08:01:18 +0000 (01:01 -0700)]
"MMB21"
The Android Automerger [Wed, 21 Oct 2015 08:00:15 +0000 (01:00 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Tue, 20 Oct 2015 08:02:50 +0000 (01:02 -0700)]
"MMB20"
The Android Automerger [Tue, 20 Oct 2015 08:00:21 +0000 (01:00 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
Zach Jang [Tue, 20 Oct 2015 00:57:33 +0000 (17:57 -0700)]
Update security string to 2015-12-01
Change-Id: I525bab4579449dd285ba87d7ddc9cb36223bf7fd
The Android Automerger [Mon, 19 Oct 2015 08:00:12 +0000 (01:00 -0700)]
"MMB19"
The Android Automerger [Mon, 19 Oct 2015 08:00:07 +0000 (01:00 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Sun, 18 Oct 2015 14:03:53 +0000 (07:03 -0700)]
"MMB18"
The Android Automerger [Sun, 18 Oct 2015 14:01:39 +0000 (07:01 -0700)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
Tao Bao [Sat, 17 Oct 2015 01:19:15 +0000 (01:19 +0000)]
am
bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it\'s padded." into mnc-dev
* commit '
bc5e85afc9cbbbb3c7e7364a6ff2a29cfb596d38':
DO NOT MERGE releasetools: Always write the last block if it's padded.
Tao Bao [Sat, 17 Oct 2015 01:15:39 +0000 (01:15 +0000)]
Merge "DO NOT MERGE releasetools: Always write the last block if it's padded." into mnc-dev
Tao Bao [Sat, 17 Oct 2015 00:09:35 +0000 (00:09 +0000)]
am
e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.
* commit '
e09359abc0f8c29fbb16d35ab7375d80fde6f931':
DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
Tao Bao [Tue, 13 Oct 2015 23:37:12 +0000 (16:37 -0700)]
DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
When building incremental packages, the info_dict from the source build
should be the one in use. We have done that for most of the partitions
(system and etc.), and should pass that to vendor's script as well.
Also includes the CL in commit
aac4ad56b6c60e271d807604b20f72084c58b426
that fixes a bug in commit
6f0b219ac551710c724e3f344023943178cdc217.
Bug:
24898607
Change-Id: I4ea6037dad7061e1683661fc4c394fa3a7a7c5cd
(cherry picked from commit
6f0b219ac551710c724e3f344023943178cdc217)
Tao Bao [Sun, 6 Sep 2015 03:35:32 +0000 (20:35 -0700)]
DO NOT MERGE releasetools: Always write the last block if it's padded.
In BBOTAs if the last block of a DataImage is padded, we should always
write the whole block even for incremental OTAs. Because otherwise the
last block may be skipped if unchanged, but would fail the post-install
verification if it has non-zero contents in the padding bytes.
Bug:
24981812
Change-Id: Id0608384fcff0375aec8c158e6f909569b873d31
(cherry picked from commit
7589e961a7b8b7d964704db87f83ed8811e97ac6)
The Android Automerger [Thu, 15 Oct 2015 08:01:37 +0000 (01:01 -0700)]
"MMB15"
OSDN Git Service
