OSDN Git Service
Dan Willemsen [Tue, 29 Nov 2016 20:47:33 +0000 (20:47 +0000)]
Add basic VNDK support in Make am:
bab0fa6928
am:
323efd3035
Change-Id: I6a3f89a810782b965152a415947da26b930fc408
Dan Willemsen [Tue, 29 Nov 2016 20:47:27 +0000 (20:47 +0000)]
Remove GLOBAL_LD_DIRS am:
e5836c4bb0
am:
28cf7d49ab
Change-Id: I35109a1e1ec6fb546da0e4cf439e670d4f8c8cd0
Dan Willemsen [Tue, 29 Nov 2016 20:42:32 +0000 (20:42 +0000)]
Add basic VNDK support in Make
am:
bab0fa6928
Change-Id: Ie2bc9062891b2f8000b1db471b27f58c74190e92
Dan Willemsen [Tue, 29 Nov 2016 20:42:26 +0000 (20:42 +0000)]
Remove GLOBAL_LD_DIRS
am:
e5836c4bb0
Change-Id: I6683ed19bff601075e82065c5c1dc783d62249b4
Tao Bao [Tue, 29 Nov 2016 00:28:07 +0000 (00:28 +0000)]
Makefile: Pack verity_verifier into otatools.zip. am:
7bb3aff71c am:
ad8924117d am:
7981d953a9
am:
41fd473e45
Change-Id: I096bab71bc1bdf3cfd9e8ede276504b65313af9c
Tao Bao [Tue, 29 Nov 2016 00:24:05 +0000 (00:24 +0000)]
Makefile: Pack verity_verifier into otatools.zip. am:
7bb3aff71c am:
ad8924117d
am:
7981d953a9
Change-Id: I8ccc7c02e2c577293b7bfc29759b79f1908863d8
Tao Bao [Tue, 29 Nov 2016 00:19:36 +0000 (00:19 +0000)]
Makefile: Pack verity_verifier into otatools.zip. am:
7bb3aff71c
am:
ad8924117d
Change-Id: Ia766ef6038434d8435a81f7e921de2936fd33411
Tao Bao [Tue, 29 Nov 2016 00:15:05 +0000 (00:15 +0000)]
Makefile: Pack verity_verifier into otatools.zip.
am:
7bb3aff71c
Change-Id: Iffb447dea7f4b227edf5311229ea0902bb4b25f5
Zheng Zhang [Tue, 29 Nov 2016 00:05:56 +0000 (00:05 +0000)]
Merge "DO NOT MERGE: build_image: add padding to match partition size" into cw-f-dev
am:
28b96d1470
Change-Id: I15652b49a63793ca7a6783d92a069114a31da672
Sami Tolvanen [Tue, 29 Nov 2016 00:05:40 +0000 (00:05 +0000)]
DO NOT MERGE: build_image: add padding to match partition size
am:
9a675c94d3 -s ours
Change-Id: If0f79158a14fb0ee565990fa32cf899ec346b12f
Adam Seaton [Mon, 28 Nov 2016 22:19:24 +0000 (22:19 +0000)]
Merge changes I30f397b0,I717a6f03 into lmp-dev am:
1a242b67fe am:
27ac4ac1da am:
ac64c64f9a am:
618f64d183 am:
d635edfd04 am:
6f0c3f4bdc am:
c5ecbe4047 am:
4a45d769e9 am:
e033ae9cff am:
8185ca3cd3
am:
777b8bb190
Change-Id: I44b2a75e03bf46c5426cf4da1c4ea09f3717b487
Adam Seaton [Mon, 28 Nov 2016 22:19:15 +0000 (22:19 +0000)]
Updating Security String to 2017-01-05 am:
26250019df am:
6a9981128d am:
1691e69497 -s ours am:
4d3fa3f47e am:
26f54a9c9d am:
1685901f54 am:
de90bd9c11 am:
373d596d29 am:
d4318b4dd8 am:
6b712cfc00
am:
f374f992fa
Change-Id: I5e59a22b40f793afab182894c9bc4df40c96dd43
Adam Seaton [Mon, 28 Nov 2016 22:19:05 +0000 (22:19 +0000)]
Updating Security String to 2017-01-01 am:
a0985a838b am:
542e90b0be am:
99abf297d8 -s ours am:
8316b162d9 am:
3d6c04a185 am:
954e945541 am:
00e57d1e7d am:
69324d3272 am:
aca891ceb7 am:
c7c9e9e6ae
am:
da23655530
Change-Id: I544e10e76fa66a1ef42c366eb79933ac21f314fc
Adam Seaton [Mon, 28 Nov 2016 22:18:40 +0000 (22:18 +0000)]
Update Security String to 2017-01-05 in klp-dev am:
4f483f18e7 am:
b2cc64fdd5 am:
3fa1b8a55e -s ours am:
7fa6402d8e am:
70849c073b am:
85e8b1c54f am:
a0e047834c am:
e515169acc am:
925cdbcc44 am:
3b6d4247d4 am:
fc9a3a6289 am:
e6228c3c29 am:
26cd57c3dd
am:
973cf83398
Change-Id: I02df1a95bdf119011de936a7ddfccee79de91c10
Adam Seaton [Mon, 28 Nov 2016 22:18:29 +0000 (22:18 +0000)]
Update Security string to 2017-01-01 in klp-dev am:
21f5d281f3 am:
0f344dd00a am:
a50e96923c -s ours am:
6a89a1936f am:
2652d28bea am:
a8cedadbf9 am:
f1372e43e5 am:
27202c78b9 am:
0ab37afc51 am:
23654fcee6 am:
49ab1b9aec am:
4066fd01b1 am:
c9372a0cf7
am:
8755a73c93
Change-Id: Ie472dfdae1fac4a5c7112141f63030cd4b6ae00c
Adam Seaton [Mon, 28 Nov 2016 22:18:01 +0000 (22:18 +0000)]
Updating Security String to 2017-01-05 on mnc-dev am:
5e46dc2215 am:
f57eb8ce2d am:
b81dff49dc am:
b25cb027ea -s ours am:
d74f26b3bf am:
54bfae5f11 am:
23ecbbbe31
am:
01ccb41c44
Change-Id: I70566cb5f2933dd2d59bfcee050fec81f40d7f1b
Adam Seaton [Mon, 28 Nov 2016 22:17:50 +0000 (22:17 +0000)]
Updating Security string to 2017-01-01 on mnc-dev am:
7224901e6b am:
5b54c86fb7 am:
0ca9715ced am:
1512b79479 -s ours am:
6eb9073057 am:
25d73fa79b am:
989a7633f7
am:
813ec07751
Change-Id: I11be60d37a54f481c97b9cadbbc092226d662bfc
Adam Seaton [Mon, 28 Nov 2016 22:17:27 +0000 (22:17 +0000)]
Updating Security String to 2017-01-05 on nyc-dev am:
190129bc61 am:
b9085822a5 am:
091dea5c83
am:
223b79e356
Change-Id: I2348ef3b34370e4bbc5634a17565cfc2d54b0217
Adam Seaton [Mon, 28 Nov 2016 22:17:21 +0000 (22:17 +0000)]
Updating Security String to 2017-01-01 on nyc-dev am:
202380f93e am:
6108f21d36 am:
6a954bbdbc
am:
2e5e286112
Change-Id: I25ce54c3b60632005f4c5d6a76241f9a996d9961
Tao Bao [Mon, 28 Nov 2016 22:17:06 +0000 (22:17 +0000)]
releasetools: Use java_path in sign_target_files_apks.py. am:
cd4f7c96c0 am:
6414a94c50 am:
4722fc1734
am:
e6a27e7e69
Change-Id: I091d4adc8e6d153ed77b41a27b90b2642c8d0f72
Alexander Levitskiy [Mon, 28 Nov 2016 22:16:44 +0000 (22:16 +0000)]
Merge "build: tools: Add json collection of installed files with hashes." into cw-f-dev
am:
343d72fac8 -s ours
Change-Id: Ie5dd7f5e7cc3cabb9688dbc0d5ca602b7d85feec
Sasha Levitskiy [Mon, 28 Nov 2016 22:16:42 +0000 (22:16 +0000)]
build: tools: Add json collection of installed files with hashes.
am:
3c97fa78cd -s ours
Change-Id: Ida939796284dc13f5e06ac8541253ab453c4ec2d
Tao Bao [Mon, 28 Nov 2016 22:16:08 +0000 (22:16 +0000)]
releasetools: Support verity signer args. am:
c7814837a0 am:
8a6d94c9aa am:
b31f486d75
am:
53a1acf53b
Change-Id: If1943ed19ad26d00be65ba864b0372aafaaca2a7
Dan Willemsen [Fri, 18 Nov 2016 22:05:39 +0000 (14:05 -0800)]
Add basic VNDK support in Make
Add BOARD_VNDK_VERSION and LOCAL_USE_VNDK to specify the version of the
VNDK that will be used globally, and whether to use the VNDK on a module
basis.
If the board is using the VNDK:
* LOCAL_COPY_HEADERS may only be used by modules defining LOCAL_USE_VNDK
* LOCAL_USE_VNDK modules will compile against the NDK headers and stub
libraries, but continue to use the platform libc++.
* LOCAL_USE_VNDK modules will not have the global includes like
system/core/include, but it will use device-specific kernel headers.
This change does not attempt to enforce any linking constraints, that
will come in a later patch.
Test: out/build-aosp_arm.ninja is identical before/after
Change-Id: Icce65d4974f085093d500b5b2516983788fe2905
Dan Willemsen [Tue, 22 Nov 2016 23:13:56 +0000 (15:13 -0800)]
Remove GLOBAL_LD_DIRS
The last user of this was the NDK, which has been using full paths in
binary.mk. So remove it.
Test: lunch aosp_arm-eng; m -j native
Change-Id: Ida2523a2d19131ee3ef005edb3e5bcf830710b11
Tao Bao [Mon, 28 Nov 2016 18:17:57 +0000 (18:17 +0000)]
Merge "Makefile: Pack verity_verifier into otatools.zip." am:
31543713fc
am:
5cd53f7e22
Change-Id: Iddf347069d59f2e6e90e509e1768f5fffbff1cf3
Tao Bao [Mon, 28 Nov 2016 18:17:42 +0000 (18:17 +0000)]
Makefile: Pack verity_verifier into otatools.zip. am:
7f02f3413b
am:
3b35352e1b
Change-Id: Ia25e3e004abce18bbd05001b783a2eeda1717e20
Tao Bao [Mon, 28 Nov 2016 18:13:45 +0000 (18:13 +0000)]
Merge "Makefile: Pack verity_verifier into otatools.zip."
am:
31543713fc
Change-Id: I94587dc4f80edd61d5d414742513c4360609259f
Tao Bao [Mon, 28 Nov 2016 18:13:43 +0000 (18:13 +0000)]
Makefile: Pack verity_verifier into otatools.zip.
am:
7f02f3413b
Change-Id: Ib9c73dd16016b582dbaf2c40ebfc9b20c1adabe3
Tao Bao [Sat, 19 Nov 2016 01:04:24 +0000 (17:04 -0800)]
Makefile: Pack verity_verifier into otatools.zip.
verity_verifier is needed when verifying verity metadata.
Bug:
32173582
Test: `m otatools-package`
Change-Id: I63fdeb75cdca10ea38c1df978d64701acdd4c1db
(cherry picked from commit
7f02f3413b8cd2e6b5cfda3883b2783ab819558b)
Tao Bao [Mon, 28 Nov 2016 18:04:04 +0000 (18:04 +0000)]
Merge "Makefile: Pack verity_verifier into otatools.zip."
Tao Bao [Sat, 19 Nov 2016 01:04:24 +0000 (17:04 -0800)]
Makefile: Pack verity_verifier into otatools.zip.
verity_verifier is needed when verifying verity metadata.
Bug:
32173582
Test: `m otatools-package`
Change-Id: I63fdeb75cdca10ea38c1df978d64701acdd4c1db
Ian Rogers [Tue, 22 Nov 2016 18:53:21 +0000 (18:53 +0000)]
Merge "Update warn.py for new Error Prone diagnostics" am:
7ed3af23a8
am:
1eef968704
Change-Id: I853848314ffce962a8b0c5dcf5cfc99343461e88
Ian Rogers [Tue, 22 Nov 2016 18:50:21 +0000 (18:50 +0000)]
Merge "Update warn.py for new Error Prone diagnostics"
am:
7ed3af23a8
Change-Id: Iae1dec6c0b48be23d874c01b9d87627bbf0c0caf
Ian Rogers [Tue, 22 Nov 2016 18:43:50 +0000 (18:43 +0000)]
Merge "Update warn.py for new Error Prone diagnostics"
Nick Glorioso [Tue, 15 Nov 2016 23:57:57 +0000 (15:57 -0800)]
Update warn.py for new Error Prone diagnostics
Test: Local build, tee'd to file, ran warn.py and checked output HTML
Change-Id: Iee3386e88c73e4b8e0a1fcc60105ee5fb86e3cb0
Zheng Zhang [Sun, 20 Nov 2016 06:22:16 +0000 (06:22 +0000)]
Merge "DO NOT MERGE: build_image: add padding to match partition size" into cw-f-dev
Dan Albert [Fri, 18 Nov 2016 19:12:37 +0000 (19:12 +0000)]
Merge "Support `LOCAL_SDK_VERSION := current` for NDK." am:
c7d2fe614e
am:
6cac9ba834
Change-Id: If64f88bee6162adada642ddedcf84747443068cc
Dan Albert [Fri, 18 Nov 2016 19:09:36 +0000 (19:09 +0000)]
Merge "Support `LOCAL_SDK_VERSION := current` for NDK."
am:
c7d2fe614e
Change-Id: Ibf9a4ffa74f5d05f68bd34db908fe4e5a67fe173
Treehugger Robot [Fri, 18 Nov 2016 19:04:39 +0000 (19:04 +0000)]
Merge "Support `LOCAL_SDK_VERSION := current` for NDK."
Andreas Gampe [Fri, 18 Nov 2016 02:59:28 +0000 (02:59 +0000)]
Merge "Build: Bring back SDK dependencies" am:
eb06c77b80
am:
2a2442c6f2
Change-Id: I6f3331782124fe9447b6fc2eda1727a2bb645be7
Andreas Gampe [Fri, 18 Nov 2016 02:57:28 +0000 (02:57 +0000)]
Merge "Build: Bring back SDK dependencies"
am:
eb06c77b80
Change-Id: I0c15adcd387980b94c5544427d4f4fdad3f7ff31
Andreas Gampe [Fri, 18 Nov 2016 02:53:28 +0000 (02:53 +0000)]
Merge "Build: Bring back SDK dependencies"
Andreas Gampe [Fri, 18 Nov 2016 02:21:36 +0000 (18:21 -0800)]
Build: Bring back SDK dependencies
Temporarily re-add SDK dependencies to runtime_libart.mk.
Test: m sdk_repo
Change-Id: I5c2054d7be6ea1c5e6eadbcb3453cabfc64728d6
Andreas Gampe [Fri, 18 Nov 2016 01:34:20 +0000 (01:34 +0000)]
Merge "Build: Refactor and clean up runtime_libart" am:
020f5275d5
am:
bd7d5aea2a
Change-Id: I203c3da1abfc17a22eaedf719dd13a2b083a8680
Andreas Gampe [Fri, 18 Nov 2016 01:32:20 +0000 (01:32 +0000)]
Merge "Build: Refactor and clean up runtime_libart"
am:
020f5275d5
Change-Id: Ifff0829fe3b7e306527e3654ee3833a1935c1ac3
Treehugger Robot [Fri, 18 Nov 2016 01:25:53 +0000 (01:25 +0000)]
Merge "Build: Refactor and clean up runtime_libart"
William Roberts [Fri, 18 Nov 2016 01:12:16 +0000 (01:12 +0000)]
Merge "fs_config: move sort to be consistent with other sort" am:
052a01958c
am:
c06559eb7b
Change-Id: I2acabfd1f5912da126dbc31559e3b458810e75d0
William Roberts [Fri, 18 Nov 2016 00:57:15 +0000 (00:57 +0000)]
Merge "fs_config: move sort to be consistent with other sort"
am:
052a01958c
Change-Id: If18ab459d74e20f96db56d80ecdbf94580583463
Treehugger Robot [Fri, 18 Nov 2016 00:29:52 +0000 (00:29 +0000)]
Merge "fs_config: move sort to be consistent with other sort"
William Roberts [Thu, 17 Nov 2016 23:58:16 +0000 (23:58 +0000)]
Merge "fs_config: correct README" am:
4baaf905ee
am:
2088e57ed8
Change-Id: Ieb523540e0f7ec0e79f52e434d4914e4c1ba47c5
Andreas Gampe [Thu, 17 Nov 2016 23:58:02 +0000 (23:58 +0000)]
Merge "Build: Add agent library to default packages" am:
709aaa5aea
am:
349b67c6ba
Change-Id: I5c0155b04ef5846b5cc53fb9933bd2998d14b2ae
William Roberts [Thu, 17 Nov 2016 23:42:52 +0000 (23:42 +0000)]
Merge "fs_config: correct README"
am:
4baaf905ee
Change-Id: I1a3fa8a296608205a29efb94c32fbfd14d4844f2
Andreas Gampe [Thu, 17 Nov 2016 23:42:38 +0000 (23:42 +0000)]
Merge "Build: Add agent library to default packages"
am:
709aaa5aea
Change-Id: I61e55b948838d8845d04802e87d435ac8b9f9b3c
Treehugger Robot [Thu, 17 Nov 2016 23:30:50 +0000 (23:30 +0000)]
Merge "fs_config: correct README"
Treehugger Robot [Thu, 17 Nov 2016 23:17:08 +0000 (23:17 +0000)]
Merge "Build: Add agent library to default packages"
Andreas Gampe [Thu, 17 Nov 2016 21:54:49 +0000 (13:54 -0800)]
Build: Refactor and clean up runtime_libart
Split out dependencies and removes some transitives. In preparation
for moving the modules.
Test: m
Test: Device boots
Change-Id: I7cdccd178eef9a625607a74ba8496651591e4cb4
William Roberts [Sat, 9 Apr 2016 05:06:19 +0000 (22:06 -0700)]
fs_config: move sort to be consistent with other sort
Test: Checked diff and hash of before and after output files, same.
Test: Tested build for basic boot and functionality.
Change-Id: If7806427e3a2a9ddb7a2c9aa14e1e4f9bf696acf
Signed-off-by: William Roberts <william.c.roberts@intel.com>
William Roberts [Sat, 9 Apr 2016 17:24:25 +0000 (10:24 -0700)]
fs_config: correct README
Testing on earlier versions of Python indicated an error in the
README. Python's ConfigParser prior to version 3.2 allows for
sections within the same file to override later sections.
Correct the README.
Test: Checked diff and hash of output file from before and after.
Change-Id: Ifd3f78414b4803e4b74decb1fdf6816d4902c4a2
Signed-off-by: William Roberts <william.c.roberts@intel.com>
Andreas Gampe [Thu, 27 Oct 2016 20:23:29 +0000 (13:23 -0700)]
Build: Add agent library to default packages
Add libopenjdkjvmti to ART dependencies.
Bug:
31455788
Test: m && ls $OUT/system/lib/libopenjdkjvmti.so
Change-Id: Iccf35f04548d74df87ec05f2cb555c1db9d137c6
Adam Seaton [Thu, 17 Nov 2016 19:50:33 +0000 (19:50 +0000)]
Merge changes I30f397b0,I717a6f03 into lmp-dev am:
1a242b67fe am:
27ac4ac1da am:
ac64c64f9a am:
618f64d183 am:
d635edfd04 am:
6f0c3f4bdc am:
c5ecbe4047 am:
4a45d769e9 am:
e033ae9cff
am:
8185ca3cd3
Change-Id: I6dc1ad0fb19ca478f786274c355f7ad71871a6e3
Adam Seaton [Thu, 17 Nov 2016 19:50:28 +0000 (19:50 +0000)]
Updating Security String to 2017-01-05 am:
26250019df am:
6a9981128d am:
1691e69497 -s ours am:
4d3fa3f47e am:
26f54a9c9d am:
1685901f54 am:
de90bd9c11 am:
373d596d29 am:
d4318b4dd8
am:
6b712cfc00
Change-Id: I8994a15e2a1a561ac62bd078544a629965c092cf
Adam Seaton [Thu, 17 Nov 2016 19:50:22 +0000 (19:50 +0000)]
Updating Security String to 2017-01-01 am:
a0985a838b am:
542e90b0be am:
99abf297d8 -s ours am:
8316b162d9 am:
3d6c04a185 am:
954e945541 am:
00e57d1e7d am:
69324d3272 am:
aca891ceb7
am:
c7c9e9e6ae
Change-Id: I2f7a9455feb7a71d9c69ef5eaf00ba579dc19484
Adam Seaton [Thu, 17 Nov 2016 19:42:32 +0000 (19:42 +0000)]
Merge changes I30f397b0,I717a6f03 into lmp-dev am:
1a242b67fe am:
27ac4ac1da am:
ac64c64f9a am:
618f64d183 am:
d635edfd04 am:
6f0c3f4bdc am:
c5ecbe4047 am:
4a45d769e9
am:
e033ae9cff
Change-Id: I5e382f4500c675d4ff7e57ce0edf94b2dbf1e9ce
Adam Seaton [Thu, 17 Nov 2016 19:42:25 +0000 (19:42 +0000)]
Updating Security String to 2017-01-05 am:
26250019df am:
6a9981128d am:
1691e69497 -s ours am:
4d3fa3f47e am:
26f54a9c9d am:
1685901f54 am:
de90bd9c11 am:
373d596d29
am:
d4318b4dd8
Change-Id: Ice239eb8dff884b330c68d99065b99ed013bf324
Adam Seaton [Thu, 17 Nov 2016 19:42:18 +0000 (19:42 +0000)]
Updating Security String to 2017-01-01 am:
a0985a838b am:
542e90b0be am:
99abf297d8 -s ours am:
8316b162d9 am:
3d6c04a185 am:
954e945541 am:
00e57d1e7d am:
69324d3272
am:
aca891ceb7
Change-Id: Ief475655c01f73766949ecae0b0e56fc0f84cd18
Adam Seaton [Thu, 17 Nov 2016 19:34:32 +0000 (19:34 +0000)]
Merge changes I30f397b0,I717a6f03 into lmp-dev am:
1a242b67fe am:
27ac4ac1da am:
ac64c64f9a am:
618f64d183 am:
d635edfd04 am:
6f0c3f4bdc am:
c5ecbe4047
am:
4a45d769e9
Change-Id: I4be9db9c0a6554c89e757220b115f2af22631964
Adam Seaton [Thu, 17 Nov 2016 19:34:26 +0000 (19:34 +0000)]
Updating Security String to 2017-01-05 am:
26250019df am:
6a9981128d am:
1691e69497 -s ours am:
4d3fa3f47e am:
26f54a9c9d am:
1685901f54 am:
de90bd9c11
am:
373d596d29
Change-Id: Id74ddab87bc958c23891c499e311fbeae5844171
Adam Seaton [Thu, 17 Nov 2016 19:34:19 +0000 (19:34 +0000)]
Updating Security String to 2017-01-01 am:
a0985a838b am:
542e90b0be am:
99abf297d8 -s ours am:
8316b162d9 am:
3d6c04a185 am:
954e945541 am:
00e57d1e7d
am:
69324d3272
Change-Id: I1c1f7c40909b0000fdb505491152dbada43bc1f9
Adam Seaton [Thu, 17 Nov 2016 19:27:29 +0000 (19:27 +0000)]
Merge changes I30f397b0,I717a6f03 into lmp-dev am:
1a242b67fe am:
27ac4ac1da am:
ac64c64f9a am:
618f64d183 am:
d635edfd04 am:
6f0c3f4bdc
am:
c5ecbe4047
Change-Id: Id66af0612e1c29d234801e8b1a3f2fa90ba58643
Adam Seaton [Thu, 17 Nov 2016 19:27:23 +0000 (19:27 +0000)]
Updating Security String to 2017-01-05 am:
26250019df am:
6a9981128d am:
1691e69497 -s ours am:
4d3fa3f47e am:
26f54a9c9d am:
1685901f54
am:
de90bd9c11
Change-Id: I8e628479bba5e7078c792ffb239957eb9c655a84
Adam Seaton [Thu, 17 Nov 2016 19:27:17 +0000 (19:27 +0000)]
Updating Security String to 2017-01-01 am:
a0985a838b am:
542e90b0be am:
99abf297d8 -s ours am:
8316b162d9 am:
3d6c04a185 am:
954e945541
am:
00e57d1e7d
Change-Id: I3dd1b9cb2c3cdb8c67680f813d2a7de7fb244da9
Adam Seaton [Thu, 17 Nov 2016 19:19:58 +0000 (19:19 +0000)]
Merge changes I30f397b0,I717a6f03 into lmp-dev am:
1a242b67fe am:
27ac4ac1da am:
ac64c64f9a am:
618f64d183 am:
d635edfd04
am:
6f0c3f4bdc
Change-Id: I85587a1eccc80443efb76853ec70ea339e422481
Adam Seaton [Thu, 17 Nov 2016 19:19:51 +0000 (19:19 +0000)]
Updating Security String to 2017-01-05 am:
26250019df am:
6a9981128d am:
1691e69497 -s ours am:
4d3fa3f47e am:
26f54a9c9d
am:
1685901f54
Change-Id: I66d237a4e44a97297f95b2ba24d761dbc70b29c7
Adam Seaton [Thu, 17 Nov 2016 19:19:46 +0000 (19:19 +0000)]
Updating Security String to 2017-01-01 am:
a0985a838b am:
542e90b0be am:
99abf297d8 -s ours am:
8316b162d9 am:
3d6c04a185
am:
954e945541
Change-Id: I8e52d83745ef061bf8b372086fcdaa6d64a9211c
Adam Seaton [Thu, 17 Nov 2016 19:12:27 +0000 (19:12 +0000)]
Merge changes I30f397b0,I717a6f03 into lmp-dev am:
1a242b67fe am:
27ac4ac1da am:
ac64c64f9a am:
618f64d183
am:
d635edfd04
Change-Id: I89bbff14776bbdec62f465342818f95cf38a5b80
Adam Seaton [Thu, 17 Nov 2016 19:12:23 +0000 (19:12 +0000)]
Updating Security String to 2017-01-05 am:
26250019df am:
6a9981128d am:
1691e69497 -s ours am:
4d3fa3f47e
am:
26f54a9c9d
Change-Id: I1fb4a8e558b2849c7104003d852d7e5577be66ed
Adam Seaton [Thu, 17 Nov 2016 19:12:18 +0000 (19:12 +0000)]
Updating Security String to 2017-01-01 am:
a0985a838b am:
542e90b0be am:
99abf297d8 -s ours am:
8316b162d9
am:
3d6c04a185
Change-Id: Id60b5b3182dfa8328767853a516959705a282dc0
Adam Seaton [Thu, 17 Nov 2016 19:05:27 +0000 (19:05 +0000)]
Merge changes I30f397b0,I717a6f03 into lmp-dev am:
1a242b67fe am:
27ac4ac1da am:
ac64c64f9a
am:
618f64d183
Change-Id: I5e8593a648f5a5be6426e716f0f11f95a948abff
Adam Seaton [Thu, 17 Nov 2016 19:05:21 +0000 (19:05 +0000)]
Updating Security String to 2017-01-05 am:
26250019df am:
6a9981128d am:
1691e69497 -s ours
am:
4d3fa3f47e
Change-Id: I47fa23d0756c00749a63c778b589cd9f168ff16b
Adam Seaton [Thu, 17 Nov 2016 19:05:16 +0000 (19:05 +0000)]
Updating Security String to 2017-01-01 am:
a0985a838b am:
542e90b0be am:
99abf297d8 -s ours
am:
8316b162d9
Change-Id: I74277f546f9bb945df45472181f87e7c503b0799
Adam Seaton [Thu, 17 Nov 2016 18:57:26 +0000 (18:57 +0000)]
Merge changes I30f397b0,I717a6f03 into lmp-dev am:
1a242b67fe am:
27ac4ac1da
am:
ac64c64f9a
Change-Id: I065c4413434b01bbe13dc25437f5c45dade7acdb
Adam Seaton [Thu, 17 Nov 2016 18:57:21 +0000 (18:57 +0000)]
Updating Security String to 2017-01-05 am:
26250019df am:
6a9981128d
am:
1691e69497 -s ours
Change-Id: Ia8212c5397b14473bfa8916b96d9365f34818229
Adam Seaton [Thu, 17 Nov 2016 18:57:16 +0000 (18:57 +0000)]
Updating Security String to 2017-01-01 am:
a0985a838b am:
542e90b0be
am:
99abf297d8 -s ours
Change-Id: Ib9fc62c50d1d3d07fa0ad03dd93a8c88e10d5c3c
Adam Seaton [Thu, 17 Nov 2016 18:18:50 +0000 (18:18 +0000)]
Merge changes I30f397b0,I717a6f03 into lmp-dev am:
1a242b67fe
am:
27ac4ac1da
Change-Id: Iee18a297b1c52c6c149846670b0e73cf5a23a53c
Adam Seaton [Thu, 17 Nov 2016 18:18:45 +0000 (18:18 +0000)]
Updating Security String to 2017-01-05 am:
26250019df
am:
6a9981128d
Change-Id: I99d0bef8d06bd350fdacdc425da61cf9169f963f
Adam Seaton [Thu, 17 Nov 2016 18:18:41 +0000 (18:18 +0000)]
Updating Security String to 2017-01-01 am:
a0985a838b
am:
542e90b0be
Change-Id: I8cb08c9722b7aea116cd93b6cabea2200b05bbd3
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 01:04:53 +0000 (01:04 +0000)]
Update Security String to 2017-01-05 in klp-dev am:
4f483f18e7 am:
b2cc64fdd5 am:
3fa1b8a55e -s ours am:
7fa6402d8e am:
70849c073b am:
85e8b1c54f am:
a0e047834c am:
e515169acc am:
925cdbcc44 am:
3b6d4247d4 am:
fc9a3a6289 am:
e6228c3c29
am:
26cd57c3dd
Change-Id: I68629fffd4ad784af3fd1f5b2189c6c31387e5d0
Adam Seaton [Thu, 17 Nov 2016 01:04:41 +0000 (01:04 +0000)]
Update Security string to 2017-01-01 in klp-dev am:
21f5d281f3 am:
0f344dd00a am:
a50e96923c -s ours am:
6a89a1936f am:
2652d28bea am:
a8cedadbf9 am:
f1372e43e5 am:
27202c78b9 am:
0ab37afc51 am:
23654fcee6 am:
49ab1b9aec am:
4066fd01b1
am:
c9372a0cf7
Change-Id: I454e61f8b190e1436e8d58a5ac8412a8fcb79962
Adam Seaton [Thu, 17 Nov 2016 00:56:52 +0000 (00:56 +0000)]
Update Security String to 2017-01-05 in klp-dev am:
4f483f18e7 am:
b2cc64fdd5 am:
3fa1b8a55e -s ours am:
7fa6402d8e am:
70849c073b am:
85e8b1c54f am:
a0e047834c am:
e515169acc am:
925cdbcc44 am:
3b6d4247d4 am:
fc9a3a6289
am:
e6228c3c29
Change-Id: If1e0660b8615b488d0b3a16ca0258570840dd63e
Adam Seaton [Thu, 17 Nov 2016 00:56:41 +0000 (00:56 +0000)]
Update Security string to 2017-01-01 in klp-dev am:
21f5d281f3 am:
0f344dd00a am:
a50e96923c -s ours am:
6a89a1936f am:
2652d28bea am:
a8cedadbf9 am:
f1372e43e5 am:
27202c78b9 am:
0ab37afc51 am:
23654fcee6 am:
49ab1b9aec
am:
4066fd01b1
Change-Id: I0233fbe50be4f6b9e552e840fc8892a89a2dfadf
Adam Seaton [Thu, 17 Nov 2016 00:50:16 +0000 (00:50 +0000)]
Update Security String to 2017-01-05 in klp-dev am:
4f483f18e7 am:
b2cc64fdd5 am:
3fa1b8a55e -s ours am:
7fa6402d8e am:
70849c073b am:
85e8b1c54f am:
a0e047834c am:
e515169acc am:
925cdbcc44 am:
3b6d4247d4
am:
fc9a3a6289
Change-Id: Ia6f2eb896ab071bdb3f5310d99062aa49e17231e
Adam Seaton [Thu, 17 Nov 2016 00:50:09 +0000 (00:50 +0000)]
Update Security string to 2017-01-01 in klp-dev am:
21f5d281f3 am:
0f344dd00a am:
a50e96923c -s ours am:
6a89a1936f am:
2652d28bea am:
a8cedadbf9 am:
f1372e43e5 am:
27202c78b9 am:
0ab37afc51 am:
23654fcee6
am:
49ab1b9aec
Change-Id: I9cdc0480795051c789a5c3ab9e4ff3fd18475c03
Adam Seaton [Thu, 17 Nov 2016 00:43:14 +0000 (00:43 +0000)]
Updating Security String to 2017-01-05 on mnc-dev am:
5e46dc2215 am:
f57eb8ce2d am:
b81dff49dc am:
b25cb027ea -s ours am:
d74f26b3bf am:
54bfae5f11
am:
23ecbbbe31
Change-Id: Id850185feea9ce6ab3983e98a60108bf6f85ccfa
Adam Seaton [Thu, 17 Nov 2016 00:43:14 +0000 (00:43 +0000)]
Update Security String to 2017-01-05 in klp-dev am:
4f483f18e7 am:
b2cc64fdd5 am:
3fa1b8a55e -s ours am:
7fa6402d8e am:
70849c073b am:
85e8b1c54f am:
a0e047834c am:
e515169acc am:
925cdbcc44
am:
3b6d4247d4
Change-Id: I020c834b0fcb8b729daf0c2993690b940268f8d9
Adam Seaton [Thu, 17 Nov 2016 00:43:08 +0000 (00:43 +0000)]
Updating Security string to 2017-01-01 on mnc-dev am:
7224901e6b am:
5b54c86fb7 am:
0ca9715ced am:
1512b79479 -s ours am:
6eb9073057 am:
25d73fa79b
am:
989a7633f7
Change-Id: I4f59e1af718f44ae11ff78e222e9a863c26be0e7
OSDN Git Service
