OSDN Git Service
Adam Seaton [Tue, 17 Jan 2017 23:10:12 +0000 (23:10 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev
am:
84888652e0 -s ours
Change-Id: Iffdd616a77cdfc1080f0b2719efd485a39232d5a
Adam Seaton [Tue, 17 Jan 2017 23:10:09 +0000 (23:10 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev
am:
28dae4b62b -s ours
Change-Id: I18f5e8d6919f1cf0e8d75781ba7c7b4cf39a6dcc
Adam Seaton [Tue, 17 Jan 2017 19:29:08 +0000 (11:29 -0800)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev
b/
34345751
Change-Id: Ie5bd1ced37f4ca9642c572ca0e3e0008bf1639e8
Adam Seaton [Tue, 17 Jan 2017 19:28:06 +0000 (11:28 -0800)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev
b/
34345751
Change-Id: I001816a1f60aa4229b8fb96a96737bcebf416cef
Adam Seaton [Thu, 8 Dec 2016 00:29:39 +0000 (00:29 +0000)]
Updating Security String to 2017-02-05 in klp-dev am:
7078534eb1 am:
96ff32285e am:
5e8584b7e2
am:
6c8027f02c
Change-Id: I77cebe4629d3efece2209b026104aa058550e69a
Adam Seaton [Thu, 8 Dec 2016 00:29:34 +0000 (00:29 +0000)]
Update Security String to 2017-02-01 in klp-dev am:
b1a7ec0841 am:
5c99964c63 am:
ce2b665128 -s ours
am:
2c827418dd
Change-Id: Iea3362a1f04443097c4ff07b8bf3066139e10456
Adam Seaton [Thu, 8 Dec 2016 00:25:09 +0000 (00:25 +0000)]
Updating Security String to 2017-02-05 in klp-dev am:
7078534eb1 am:
96ff32285e
am:
5e8584b7e2
Change-Id: I6eecb6960cbee1a96f38c890cd3306bb6df5675d
Adam Seaton [Thu, 8 Dec 2016 00:25:05 +0000 (00:25 +0000)]
Update Security String to 2017-02-01 in klp-dev am:
b1a7ec0841 am:
5c99964c63
am:
ce2b665128 -s ours
Change-Id: Ib6c86f6f0e0f9872494c2ede164adb9853b10772
Adam Seaton [Wed, 7 Dec 2016 23:53:05 +0000 (23:53 +0000)]
Updating Security String to 2017-02-05 in klp-dev am:
7078534eb1
am:
96ff32285e
Change-Id: I7f8bf0d714b48a80db63e0920069320b84f2e912
Adam Seaton [Wed, 7 Dec 2016 23:53:02 +0000 (23:53 +0000)]
Update Security String to 2017-02-01 in klp-dev am:
b1a7ec0841
am:
5c99964c63
Change-Id: I91bc884895491fcc3397245647abdb9a2a5bacf3
Adam Seaton [Wed, 7 Dec 2016 23:48:34 +0000 (23:48 +0000)]
Update Security String to 2017-02-05 in lmp-dev
am:
fd48c0bf99
Change-Id: I89e047c9df44e214270e62f9525a39ad71c422fa
Adam Seaton [Wed, 7 Dec 2016 23:48:34 +0000 (23:48 +0000)]
Updating Security String to 2017-02-05 in klp-dev
am:
7078534eb1
Change-Id: I1d3de52aa32696e62c9a44f4bc067cee37664835
Adam Seaton [Wed, 7 Dec 2016 23:48:31 +0000 (23:48 +0000)]
Update Security String to 2017-02-01 in klp-dev
am:
b1a7ec0841
Change-Id: I7fc81a77c9f8588c998d7e312fca0847b8139195
Adam Seaton [Wed, 7 Dec 2016 23:48:31 +0000 (23:48 +0000)]
Update Security String to 2017-02-01 in lmp-dev
am:
19717dff7c
Change-Id: I3c8bdfed5a0f11b5965f596aee216ced8573a644
Adam Seaton [Wed, 7 Dec 2016 22:55:22 +0000 (14:55 -0800)]
Update Security String to 2017-02-05 in lmp-dev
Change-Id: Idc65a6cb862e10980998dafddcbe15e2934af2f5
Adam Seaton [Wed, 7 Dec 2016 22:50:23 +0000 (14:50 -0800)]
Update Security String to 2017-02-01 in lmp-dev
Change-Id: I8b6c031c274781c39472ffd544b134e7d13cb78c
Adam Seaton [Wed, 7 Dec 2016 22:48:09 +0000 (14:48 -0800)]
Updating Security String to 2017-02-05 in klp-dev
Change-Id: I172647e89a12bcdf978f09fcc298f59f90a38f50
Adam Seaton [Wed, 7 Dec 2016 22:47:21 +0000 (14:47 -0800)]
Update Security String to 2017-02-01 in klp-dev
Change-Id: I8989e06799d0dc65644abd122f2f1b5cbd5125b7
Marco Nelissen [Fri, 2 Dec 2016 15:55:31 +0000 (15:55 +0000)]
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev
am:
198262ff83 -s ours
Change-Id: I0a336fa847df3c1375e1263e50723f08635d531f
Marco Nelissen [Fri, 2 Dec 2016 15:55:30 +0000 (15:55 +0000)]
DO NOT MERGE increase generic_mips system partition
am:
7824073a36 -s ours
Change-Id: I1b60e3cfc39735edfdcc48b215d53e7dac5aa207
Marco Nelissen [Fri, 2 Dec 2016 15:45:17 +0000 (15:45 +0000)]
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev
Marco Nelissen [Wed, 30 Nov 2016 21:14:13 +0000 (13:14 -0800)]
DO NOT MERGE increase generic_mips system partition
Increase system partition from 750MB to 768MB to fix
sdk_google_phone_mips build.
Change-Id: I35a60767a3dea7b1ce3c97246f4a038c98f5cb06
Adam Seaton [Thu, 17 Nov 2016 18:10:46 +0000 (18:10 +0000)]
Merge changes I30f397b0,I717a6f03 into lmp-dev
am:
1a242b67fe
Change-Id: Ifd69049e1e2d055eb99c3c40c3ca66b5500d5a1e
Adam Seaton [Thu, 17 Nov 2016 18:10:45 +0000 (18:10 +0000)]
Updating Security String to 2017-01-05
am:
26250019df
Change-Id: I35aca489641d9df526ebc153afb4dbccff2b5975
Adam Seaton [Thu, 17 Nov 2016 18:10:41 +0000 (18:10 +0000)]
Updating Security String to 2017-01-01
am:
a0985a838b
Change-Id: I09a8034abb2d691527207947928e61326b80eb04
Adam Seaton [Thu, 17 Nov 2016 18:04:32 +0000 (18:04 +0000)]
Merge changes I30f397b0,I717a6f03 into lmp-dev
* changes:
Updating Security String to 2017-01-05
Updating Security String to 2017-01-01
Adam Seaton [Thu, 17 Nov 2016 00:00:40 +0000 (00:00 +0000)]
Update Security String to 2017-01-05 in klp-dev am:
4f483f18e7 am:
b2cc64fdd5 am:
3fa1b8a55e -s ours
am:
7fa6402d8e
Change-Id: I801e3e5f409687fcf9adad26c80cb2d12d64b892
Adam Seaton [Thu, 17 Nov 2016 00:00:36 +0000 (00:00 +0000)]
Update Security string to 2017-01-01 in klp-dev am:
21f5d281f3 am:
0f344dd00a am:
a50e96923c -s ours
am:
6a89a1936f
Change-Id: I661579a56c331e2e13598079fb3c7f6fdba17597
Adam Seaton [Wed, 16 Nov 2016 23:53:38 +0000 (23:53 +0000)]
Update Security String to 2017-01-05 in klp-dev am:
4f483f18e7 am:
b2cc64fdd5
am:
3fa1b8a55e -s ours
Change-Id: Ic8fad4adf52010b89a77b6555938f61295f49706
Adam Seaton [Wed, 16 Nov 2016 23:53:34 +0000 (23:53 +0000)]
Update Security string to 2017-01-01 in klp-dev am:
21f5d281f3 am:
0f344dd00a
am:
a50e96923c -s ours
Change-Id: Ic4e9375e87fa4275e2e7ebc8504b7042c681976d
Adam Seaton [Wed, 16 Nov 2016 23:48:19 +0000 (15:48 -0800)]
Updating Security String to 2017-01-05
b/
32949407
Adam Seaton [Wed, 16 Nov 2016 23:47:08 +0000 (15:47 -0800)]
Updating Security String to 2017-01-01
b/
32949407
Adam Seaton [Wed, 16 Nov 2016 23:30:06 +0000 (23:30 +0000)]
Update Security String to 2017-01-05 in klp-dev am:
4f483f18e7
am:
b2cc64fdd5
Change-Id: I6f85f00bc24c71c9d4937cfccc652366a009fbc7
Adam Seaton [Wed, 16 Nov 2016 23:30:03 +0000 (23:30 +0000)]
Update Security string to 2017-01-01 in klp-dev am:
21f5d281f3
am:
0f344dd00a
Change-Id: Ie748c57066b230473c6dee7a5faffe4ff78ecb97
Adam Seaton [Wed, 16 Nov 2016 23:22:35 +0000 (23:22 +0000)]
Update Security String to 2017-01-05 in klp-dev
am:
4f483f18e7
Change-Id: I3ab17ff3bc8f825960a851171c402019b518658c
Adam Seaton [Wed, 16 Nov 2016 23:22:33 +0000 (23:22 +0000)]
Update Security string to 2017-01-01 in klp-dev
am:
21f5d281f3
Change-Id: I2b4d2fadeac3994ca3066b82f4e6d6c77101221e
Adam Seaton [Wed, 16 Nov 2016 21:40:19 +0000 (13:40 -0800)]
Update Security String to 2017-01-05 in klp-dev
b/
32949407
Adam Seaton [Wed, 16 Nov 2016 21:39:24 +0000 (13:39 -0800)]
Update Security string to 2017-01-01 in klp-dev
b/
32949407
Adam Seaton [Wed, 19 Oct 2016 17:36:08 +0000 (17:36 +0000)]
Update Security string to 2016-12-05
am:
873455ef7c
Change-Id: I85f709099819d8d90c7baa64dd36e0f5e92a55e0
Adam Seaton [Wed, 19 Oct 2016 17:36:03 +0000 (17:36 +0000)]
Update Security String to 2016-12-01
am:
bacdf263ee
Change-Id: Ibd560c9bb6c5a19efd4be399ca1e00efb4646213
Adam Seaton [Tue, 18 Oct 2016 22:13:07 +0000 (15:13 -0700)]
Update Security string to 2016-12-05
lmp-dev
b/
32249855
Adam Seaton [Tue, 18 Oct 2016 22:11:42 +0000 (15:11 -0700)]
Update Security String to 2016-12-01
lmp-dev
b/
32249855
Adam Seaton [Fri, 23 Sep 2016 21:38:43 +0000 (21:38 +0000)]
Update Security String to 2016-11-05 on klp-dev am:
5ecba8e0cc am:
b404280313 am:
b6621dcce4
am:
34a991851b
Change-Id: I87c80e08a201ae4b5e39b1f86810b45e5c0dca6f
Adam Seaton [Fri, 23 Sep 2016 21:36:42 +0000 (21:36 +0000)]
Update Security String to 2016-11-05 on klp-dev am:
5ecba8e0cc am:
b404280313
am:
b6621dcce4
Change-Id: I30d82900a829b6eb86419db32c22da1dc435d1a6
Adam Seaton [Fri, 23 Sep 2016 21:34:42 +0000 (21:34 +0000)]
Update Security String to 2016-11-05 on klp-dev am:
5ecba8e0cc
am:
b404280313
Change-Id: I98abad9af83a371a3e0b7916397f5a44e255b0f9
Adam Seaton [Fri, 23 Sep 2016 21:32:42 +0000 (21:32 +0000)]
Update Security String to 2016-11-05 on klp-dev
am:
5ecba8e0cc
Change-Id: I915af51aaa29f29fabcffe2729ab04cd73cd76cd
Adam Seaton [Wed, 21 Sep 2016 18:07:00 +0000 (18:07 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2
am:
57370e1f68
Change-Id: I38ac268882f035cb3ede21264dc09cb7636b2e6d
Adam Seaton [Wed, 21 Sep 2016 18:04:29 +0000 (18:04 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1
am:
0f9242c4d2
Change-Id: Ib0f308deca6d9cb6f25a8c0b2ad710676a936f49
Adam Seaton [Wed, 21 Sep 2016 18:03:00 +0000 (11:03 -0700)]
Update Security String to 2016-11-05 on klp-dev
b/
31618336
Change-Id: I55539e8d8c24f11b9743f3d40b689de7636ef40f
Adam Seaton [Wed, 21 Sep 2016 18:02:15 +0000 (18:02 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e
am:
dafa9bc77b
Change-Id: I84eb63c40130faa756e3de022de1a2c4467a6b85
Adam Seaton [Wed, 21 Sep 2016 18:01:58 +0000 (18:01 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1
am:
fcc6e603c1
Change-Id: I0f514c2c0eaaac94140b8cdc8407478abc606c35
Adam Seaton [Wed, 21 Sep 2016 17:59:28 +0000 (17:59 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev
am:
e5ecc61cf1
Change-Id: I6cabebaf6f5e39faf4bf0417eb7e88479d96947a
Adam Seaton [Wed, 21 Sep 2016 17:59:28 +0000 (17:59 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72
am:
4fd819741e
Change-Id: I309c174e2924614dd3197f33eff36063e9acc21a
Adam Seaton [Wed, 21 Sep 2016 17:56:59 +0000 (17:56 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c
am:
bf8a1cef72
Change-Id: I9f4709ddb9a9aec34efa4134d9cf652d8de81177
Adam Seaton [Wed, 21 Sep 2016 17:54:28 +0000 (17:54 +0000)]
Update Security String to 2016-11-01 b/
31618336
am:
2a03720e6c
Change-Id: I0991ac69c8effc6d263c051567b6111fd0416e65
Adam Seaton [Wed, 21 Sep 2016 17:50:21 +0000 (17:50 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev
Adam Seaton [Tue, 20 Sep 2016 16:34:22 +0000 (09:34 -0700)]
Update Security String to 2016-11-01
b/
31618336
Change-Id: Ib31ba11912f144ff34edb66dc693b92f6fc0c24b
Adam Seaton [Thu, 25 Aug 2016 23:39:01 +0000 (23:39 +0000)]
Update comments around PLATFORM_SECURITY_LEVEL am:
65994c1d13 am:
1ebc73f23f am:
0c92547698
am:
3a5317e220
Change-Id: Ib1681ee04d1862ca8f5f865b659c5a4d1ec2f0ca
Adam Seaton [Thu, 25 Aug 2016 23:35:59 +0000 (23:35 +0000)]
Update comments around PLATFORM_SECURITY_LEVEL am:
65994c1d13 am:
1ebc73f23f
am:
0c92547698
Change-Id: I1c890fb96cf9f9a3205b7df581e432b3421c8fc6
Adam Seaton [Thu, 25 Aug 2016 23:33:00 +0000 (23:33 +0000)]
Update comments around PLATFORM_SECURITY_LEVEL am:
65994c1d13
am:
1ebc73f23f
Change-Id: I08e51e8c8d5224234c31f888c5203d57ff65a4b3
Adam Seaton [Thu, 25 Aug 2016 23:30:29 +0000 (23:30 +0000)]
Update comments around PLATFORM_SECURITY_LEVEL
am:
65994c1d13
Change-Id: I800ffe93f311d9871c525f537cb92c525ac51510
Adam Seaton [Thu, 25 Aug 2016 22:30:21 +0000 (15:30 -0700)]
Update comments around PLATFORM_SECURITY_LEVEL
Bug:
29881091
Change-Id: I7f036f2602a4296bd0f9118fd2aeba9828f03710
Adam Seaton [Thu, 18 Aug 2016 20:52:11 +0000 (20:52 +0000)]
Update Security String to 2016-10-05 to platform and CTS for October Security am:
5da5be6a6a am:
4e53c17e7c am:
6bf8893f47
am:
ef7c757264
Change-Id: I213a8678acce680ff12341023ea7e653dddb9b71
Adam Seaton [Thu, 18 Aug 2016 20:49:10 +0000 (20:49 +0000)]
Update Security String to 2016-10-05 to platform and CTS for October Security am:
5da5be6a6a am:
4e53c17e7c
am:
6bf8893f47
Change-Id: I3f0fe988dd4f25942972335a2f4c0987ff519e97
Adam Seaton [Thu, 18 Aug 2016 20:45:40 +0000 (20:45 +0000)]
Update Security String to 2016-10-05 to platform and CTS for October Security am:
5da5be6a6a
am:
4e53c17e7c
Change-Id: I66f35a8c156f893d3eda8d4f0ad00af4e5831eef
Adam Seaton [Thu, 18 Aug 2016 20:42:39 +0000 (20:42 +0000)]
Update Security String to 2016-10-05 to platform and CTS for October Security
am:
5da5be6a6a
Change-Id: Ic2356af128f6acb376403bac689b28ab94335ff4
Adam Seaton [Thu, 18 Aug 2016 18:31:26 +0000 (11:31 -0700)]
Update Security String to 2016-10-05 to platform and CTS for October
Security
b/
30946906
Change-Id: I7be961202245aa93a5e72e19cb39064b7675bf95
Adam Seaton [Thu, 18 Aug 2016 18:27:00 +0000 (18:27 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October am:
3e6d6b3024 am:
985a8b2709 am:
3920471588
am:
4739db2df6
Change-Id: I0debb51e5b85691189e481cb80eb756e7bf158a8
Adam Seaton [Thu, 18 Aug 2016 18:24:00 +0000 (18:24 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October am:
3e6d6b3024 am:
985a8b2709
am:
3920471588
Change-Id: Ic6ba2917a9345601502050c76f0b2208eba24b66
Adam Seaton [Thu, 18 Aug 2016 18:20:59 +0000 (18:20 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October am:
3e6d6b3024
am:
985a8b2709
Change-Id: I18be5d0228c07d3f1b836f1f92d63538bef96f88
Adam Seaton [Thu, 18 Aug 2016 18:18:00 +0000 (18:18 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October
am:
3e6d6b3024
Change-Id: Ia61e8d85659152cdbdd2786c6651753e00e762f1
Adam Seaton [Thu, 18 Aug 2016 17:19:10 +0000 (10:19 -0700)]
Update Security String to 2016-10-01 to platform and CTS for October
Change-Id: If6d3cd562ceff218136185cd16b52ab92ed8d0f2
Adam Seaton [Mon, 8 Aug 2016 23:51:35 +0000 (23:51 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f am:
637fa9c4c5 am:
5ed4043667
am:
48e00645fe
Change-Id: I284881c64f9370598434871634a7fc7794bc6581
Adam Seaton [Mon, 8 Aug 2016 23:48:05 +0000 (23:48 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f am:
637fa9c4c5
am:
5ed4043667
Change-Id: I14818a4b4220874c816fbe9dc1d150b598f030e5
Adam Seaton [Mon, 8 Aug 2016 23:45:04 +0000 (23:45 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f
am:
637fa9c4c5
Change-Id: I8f5459266c69eddf11101f9be3a46beecdc71dad
Adam Seaton [Mon, 8 Aug 2016 23:42:34 +0000 (23:42 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin
am:
cc5148493f
Change-Id: Ib5a5e433d0a94040a4261dae9555606c34d18e81
Adam Seaton [Mon, 8 Aug 2016 21:59:46 +0000 (14:59 -0700)]
Update security string to 2016-09-07 to platform and CTS for September
respin
Change-Id: I0f753925387a19fa055efd08ce026ef98431ef03
Adam Seaton [Thu, 28 Jul 2016 22:31:12 +0000 (22:31 +0000)]
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/
30224278 am:
a234c54e2a am:
48e360c73b am:
a08cbbb97c
am:
a96455528c
Change-Id: I019d3216bafbbba0158ddd9ff93f0d8edbd7c40c
Adam Seaton [Thu, 28 Jul 2016 22:28:42 +0000 (22:28 +0000)]
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/
30224278 am:
a234c54e2a am:
48e360c73b
am:
a08cbbb97c
Change-Id: Ic0c7a50458cf9967baace9f3a46a5f61013b663d
Adam Seaton [Thu, 28 Jul 2016 22:25:45 +0000 (22:25 +0000)]
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/
30224278 am:
a234c54e2a
am:
48e360c73b
Change-Id: Id53bea6c0a355d54c461b987e5a992c9211e6d32
Adam Seaton [Thu, 28 Jul 2016 22:23:06 +0000 (22:23 +0000)]
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/
30224278
am:
a234c54e2a
Change-Id: Icef9c0d868b8658faf79aabc99a811e0b715c362
Adam Seaton [Thu, 28 Jul 2016 21:09:57 +0000 (14:09 -0700)]
Updating security string to 2016-09-05 in preparation for 2016 September
OTA for b/
30224278
Change-Id: I055d0cc3a1a5f640dabf7a404c70c317e57959ca
Zach Jang [Wed, 20 Jul 2016 01:08:10 +0000 (01:08 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d am:
5e9c40c879 am:
d46066851f
am:
c8b3df9fb8
Change-Id: Ie46aa33c4d927bed0024887c3ef59f45f516e3f9
Zach Jang [Wed, 20 Jul 2016 01:05:41 +0000 (01:05 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d am:
5e9c40c879
am:
d46066851f
Change-Id: Ibfe7fbdbfa81f053a5dd4082a8ebb403e7c57930
Zach Jang [Wed, 20 Jul 2016 01:02:41 +0000 (01:02 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d
am:
5e9c40c879
Change-Id: I8405b34a45cf8d0a0dc16bfc6b216f5c66b7f6ba
Zach Jang [Wed, 20 Jul 2016 01:00:09 +0000 (01:00 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA
am:
4d7c3a4c0d
Change-Id: I848cd6c2068f54c54a53dc5d0bb35c54fc7eb23f
Zach Jang [Tue, 19 Jul 2016 20:20:45 +0000 (13:20 -0700)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA
b/
30224278
Change-Id: I8032d58d2965fcf2c412a098cfa1d1e4c0add01d
Zach Jang [Wed, 22 Jun 2016 01:23:46 +0000 (18:23 -0700)]
resolve merge conflicts of
12db224 to lmp-mr1-dev
Change-Id: I8ef3cd2c1d9eb2e4aefe3c678f0a6bb0fdf74c29
Zach Jang [Wed, 22 Jun 2016 01:13:17 +0000 (18:13 -0700)]
resolve merge conflicts of
24cfbfa to lmp-dev
Change-Id: I5a634582647d154238c5d5bc07ccf1d0fa869132
Zach Jang [Wed, 22 Jun 2016 00:44:33 +0000 (00:44 +0000)]
Updating security string to 2016-08-05 am:
5b14c1f7ce
am:
26acdf0c13
Change-Id: I5fa856d2a68d672f314f36c315c3f1857fd386ba
Zach Jang [Wed, 22 Jun 2016 00:41:51 +0000 (00:41 +0000)]
Updating security string to 2016-08-05
am:
5b14c1f7ce
Change-Id: I5b2665a6e208d676169b33c08c6761d9de8b8320
Zach Jang [Mon, 20 Jun 2016 21:30:52 +0000 (14:30 -0700)]
Updating security string to 2016-08-05
b/
29513589
Change-Id: I5ab4a0aa9d26a95dd0e85d87dcc487867b3f284b
Zach Jang [Wed, 25 May 2016 20:21:24 +0000 (20:21 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev
Zach Jang [Wed, 25 May 2016 20:16:34 +0000 (20:16 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours
am:
79770b1927 -s ours
* commit '
79770b192771b7e332f1537fef3e3719b07bcf14':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: Ie757679100cd217973d8371de8a72adc89392bbc
Zach Jang [Wed, 25 May 2016 20:11:54 +0000 (20:11 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a
am:
60270ec785 -s ours
* commit '
60270ec78531308f91221ca09c74edee6701ec34':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: Ia89f4840478991109628844f889e6c97677b0d50
Zach Jang [Wed, 25 May 2016 20:07:30 +0000 (20:07 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375
am:
555c5af89a
* commit '
555c5af89a4b25f61ff827431b0081be7b70d5fe':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I7f662a6d72179678beee82b3cfb87525eae2b2c2
Zach Jang [Wed, 25 May 2016 20:03:05 +0000 (20:03 +0000)]
DO NOT MERGE Updating security string to 2016-07-05
am:
f885e95375
* commit '
f885e95375a48aeefd7d2451a5c61a48100bac77':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: Ic58e87cd25747728aa105047cf81a32253d4aba4
Zach Jang [Wed, 25 May 2016 19:41:59 +0000 (12:41 -0700)]
DO NOT MERGE Updating security string to 2016-07-05
b/
28912173
Change-Id: I81301d51fd62932005a24178c57a0731566910a6
Zach Jang [Wed, 25 May 2016 19:38:46 +0000 (12:38 -0700)]
Updating security string to 2016-07-05
b/
28912173
Change-Id: I5dafe754c226eeb3f0beb3b23b219df2b82ef372
Zach Jang [Tue, 24 May 2016 01:11:45 +0000 (01:11 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours
am:
e495d379de -s ours
* commit '
e495d379decdfea93789c4693dd0f96aac23c34d':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I1749805100b45f8f12cac476df8e7be3380fbd54