OSDN Git Service
Tao Bao [Fri, 24 Jun 2016 06:18:21 +0000 (06:18 +0000)]
resolve merge conflicts of
63cc08f to nyc-mr1-dev-plus-aosp
am:
7df3890039
Change-Id: I4f3dd7b66e0e5807d89cd19542c39dd81ae6ddf3
Tao Bao [Fri, 24 Jun 2016 06:07:02 +0000 (23:07 -0700)]
resolve merge conflicts of
63cc08f to nyc-mr1-dev-plus-aosp
Change-Id: I238ed096a611ccb0f2ad38ba4c1a02ceefa21b39
Tao Bao [Fri, 24 Jun 2016 05:56:32 +0000 (05:56 +0000)]
resolve merge conflicts of
fb45739 to nyc-mr1-dev-plus-aosp
am:
377f5944f6
Change-Id: I50110286e3ea25cab3038d64a37b1b5973e20117
Tao Bao [Fri, 24 Jun 2016 05:44:18 +0000 (22:44 -0700)]
resolve merge conflicts of
fb45739 to nyc-mr1-dev-plus-aosp
Change-Id: I2e867189d4f827935a4ab8af6d5c1856a8413be0
Tao Bao [Fri, 24 Jun 2016 05:42:12 +0000 (05:42 +0000)]
resolve merge conflicts of
b281433 to nyc-mr1-dev-plus-aosp
am:
707c4ae757
Change-Id: I5bce55dbaab58b7c650a0ad743a7ba90ac6160b2
Tao Bao [Fri, 24 Jun 2016 05:36:14 +0000 (22:36 -0700)]
resolve merge conflicts of
b281433 to nyc-mr1-dev-plus-aosp
Change-Id: I392b6798ad68af80d13b7e45f7b7381b19a501ac
Tao Bao [Fri, 24 Jun 2016 05:30:31 +0000 (05:30 +0000)]
Merge \\"releasetools: Support using payload_signer.\\" am:
983a42bdf1
am:
9322317ee7
Change-Id: I13c5eede68149c1dda6da9bb33a2527adc05dd8c
Tao Bao [Fri, 24 Jun 2016 05:30:30 +0000 (05:30 +0000)]
Merge \\"releasetools: replace verity keyid\\" am:
6efa887f9b
am:
45d28d7392
Change-Id: I2104805b0de9ca28fde19f2c460b540977260dc2
Tao Bao [Fri, 24 Jun 2016 05:30:30 +0000 (05:30 +0000)]
Merge \\"Replace OTA keys when signing for A/B devices.\\" am:
f2c34ece3c
am:
deb116a65d
Change-Id: Ib57f472bdd232a908e0399dc1365f9aaf8ddf3ba
Tao Bao [Fri, 24 Jun 2016 05:27:02 +0000 (05:27 +0000)]
Merge \"releasetools: Support using payload_signer.\"
am:
983a42bdf1
Change-Id: I027ae0f71c3a57ffad476791721b111605844f1d
Badhri Jagan Sridharan [Fri, 24 Jun 2016 05:27:01 +0000 (05:27 +0000)]
Merge \"releasetools: replace verity keyid\"
am:
6efa887f9b
Change-Id: I63b11e2e0d27100a58a05ea91c0e7c29bb0597ff
Tao Bao [Fri, 24 Jun 2016 05:27:00 +0000 (05:27 +0000)]
Merge \"Replace OTA keys when signing for A/B devices.\"
am:
f2c34ece3c
Change-Id: I7eb287bd486d197b3c2c96616b558e7bc9536329
Tao Bao [Fri, 24 Jun 2016 05:19:53 +0000 (05:19 +0000)]
Merge "releasetools: Support using payload_signer."
Tao Bao [Fri, 24 Jun 2016 05:19:40 +0000 (05:19 +0000)]
Merge "releasetools: replace verity keyid"
Tao Bao [Fri, 24 Jun 2016 05:19:22 +0000 (05:19 +0000)]
Merge "Replace OTA keys when signing for A/B devices."
Tao Bao [Tue, 21 Jun 2016 00:55:06 +0000 (17:55 -0700)]
releasetools: Support using payload_signer.
For A/B OTAs, by default it calls 'openssl pkeyutl' to sign the payload
and metadata with the package private key. If the private key cannot be
accessed directly, a payload signer that knows how to do that should be
supplied via "--payload_signer <signer>".
The signer will be called with "-inkey <path_to_private_key>",
"-in <input_file>" and "-out <output_file>" parameters.
Test: Use a dummy signer, call 'ota_from_target_files.py --payload_signer <signer> <target_files.zip> <ota.zip>' and verify the signatures in the generated package.
Bug:
28701652
Change-Id: I26cfdd3fdba6fc90799221741b75426988e46fd3
(cherry picked from commit
dea0f8bfed01fa620d23d7dd8ff533246f26e8a0)
Badhri Jagan Sridharan [Fri, 17 Jun 2016 02:58:44 +0000 (19:58 -0700)]
releasetools: replace verity keyid
Replace verity keyid with the keyid extracted from cert
passed through --replace_verity_keyid. The veritykeyid in the
BOOT/cmdline of input target files is replaced with keyid
extracted from --replace_verity_keyid and written to the
output target files.
BUG:
28384658
Change-Id: Ic683f36f543c4fcd94b6f95e40f01200fbf45ee1
(cherry picked from commit
b58d23fe00697a0cf9c7c9c75639fd8c7b5bb016)
Tao Bao [Thu, 16 Jun 2016 21:41:24 +0000 (14:41 -0700)]
Replace OTA keys when signing for A/B devices.
It replaces the package verification key (change of path due to
system_root_image flag), as well as the payload verification key.
Bug:
29397395
Change-Id: I10435072aaf4356f2d8b5e1b6e82eb9cead7ad62
(cherry picked from commit
24a72064309dd55d4aa80b70480eed55c54f818d)
Tao Bao [Fri, 24 Jun 2016 05:05:37 +0000 (05:05 +0000)]
Merge \\"Fix the path for verity_key replacement when signing.\\" into nyc-mr1-dev am:
5fdbfac337
am:
9e71a9e1a1
Change-Id: Id35476e67031117320aba7f857b7c5c7d431473f
Tao Bao [Fri, 24 Jun 2016 05:02:02 +0000 (05:02 +0000)]
Merge \"Fix the path for verity_key replacement when signing.\" into nyc-mr1-dev
am:
5fdbfac337
Change-Id: Id66964a5659c17f87404baaa73f9b90b98fac7fe
Tao Bao [Fri, 24 Jun 2016 04:54:20 +0000 (04:54 +0000)]
Merge "Fix the path for verity_key replacement when signing." into nyc-mr1-dev
Jeff Vander Stoep [Fri, 24 Jun 2016 03:47:34 +0000 (03:47 +0000)]
Merge \"resolve merge conflicts of
012144f to nyc-dev am:
bb9a8d8eb8 am:
f46b7b2d77\" into nyc-mr1-dev-plus-aosp
am:
7b368daac6
Change-Id: I6e01340a8bf8fd202cb97288bce7ca1b5a100f80
Daniel Micay [Fri, 24 Jun 2016 03:47:34 +0000 (03:47 +0000)]
resolve merge conflicts of
012144f to nyc-dev am:
bb9a8d8eb8 am:
b73e902c7d
am:
6fb6aa51a4
Change-Id: Idf628306cde9e0149db11c732f138289f180eea9
Android Build Merger (Role) [Fri, 24 Jun 2016 03:44:20 +0000 (03:44 +0000)]
Merge "resolve merge conflicts of
012144f to nyc-dev am:
bb9a8d8eb8 am:
f46b7b2d77" into nyc-mr1-dev-plus-aosp
Jeff Vander Stoep [Fri, 24 Jun 2016 03:44:03 +0000 (03:44 +0000)]
resolve merge conflicts of
012144f to nyc-dev am:
bb9a8d8eb8
am:
b73e902c7d
Change-Id: Ib84efcf8d64e833f93b93b0ce3ddd1f6374949cf
Jeff Vander Stoep [Fri, 24 Jun 2016 03:44:03 +0000 (03:44 +0000)]
resolve merge conflicts of
012144f to nyc-dev am:
bb9a8d8eb8
am:
f46b7b2d77
Change-Id: I047f4bbcbe7c9edbbb3d849d7437a9c69a771580
Daniel Micay [Fri, 24 Jun 2016 03:40:22 +0000 (03:40 +0000)]
resolve merge conflicts of
012144f to nyc-dev
am:
bb9a8d8eb8
Change-Id: I140f5b3da3b65cd35cd7eb00d8406870f3c0c4ca
Daniel Micay [Fri, 24 Jun 2016 03:40:22 +0000 (03:40 +0000)]
resolve merge conflicts of
012144f to nyc-dev
am:
bb9a8d8eb8
Change-Id: I98ae278400ca59a342a1cc5fe751f0e911795003
Ian Pedowitz [Thu, 23 Jun 2016 19:09:22 +0000 (19:09 +0000)]
Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""
This reverts commit
dc15ebc26cbf88dcba74aea1f005a1794c779ee6.
Fixes:
29117805
Bug:
28809789
Change-Id: I52ff3d0450928bfdc3035c1e9991741c7bcf14d0
Ian Pedowitz [Fri, 24 Jun 2016 02:58:04 +0000 (02:58 +0000)]
Merge \\"Revert \\"Revert \\"Removing N from PLATFORM_VERSION_ALL_CODENAMES\\"\\"\\" into nyc-mr1-dev am:
7b352c1d70
am:
784a663550 -s ours
Change-Id: I4bf6c9d42b8b5a929b05a0280ab52dd5ee9a87ed
Roozbeh Pournader [Fri, 24 Jun 2016 02:54:37 +0000 (02:54 +0000)]
Merge \\"Revert \\"Add Serbian in Latin script to the full locale list\\" [DO NOT MERGE]\\" into nyc-mr1-dev am:
9b6ce7bf0d
am:
a51b0b6012 -s ours
Change-Id: I1d763783ace076d99a011d9be767e87bc10df592
Baligh Uddin [Fri, 24 Jun 2016 02:54:37 +0000 (02:54 +0000)]
resolve merge conflicts of
2abbbd0 to nyc-mr1-dev-plus-aosp
am:
b79e31756b
Change-Id: Iae9c2dca0127326a4aa04a1bc7703f59ea217aa6
Ian Pedowitz [Fri, 24 Jun 2016 02:51:25 +0000 (02:51 +0000)]
Merge \"Revert \"Revert \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\"\"\" into nyc-mr1-dev
am:
7b352c1d70
Change-Id: Ib23fca169a84e412643a8fcc79ed33126485192f
Roozbeh Pournader [Fri, 24 Jun 2016 02:51:25 +0000 (02:51 +0000)]
Merge \"Revert \"Add Serbian in Latin script to the full locale list\" [DO NOT MERGE]\" into nyc-mr1-dev
am:
9b6ce7bf0d
Change-Id: Ia696c61ce6e24e29627356cfe66819ac98dfafc2
Tao Bao [Fri, 24 Jun 2016 02:48:40 +0000 (19:48 -0700)]
resolve merge conflicts of
2abbbd0 to nyc-mr1-dev-plus-aosp
Change-Id: I2d06f0cec793185533ef2fc78428dfd99815030c
Tao Bao [Sat, 18 Jun 2016 00:01:22 +0000 (17:01 -0700)]
Fix the path for verity_key replacement when signing.
system_root_image expects the key at ROOT/verity_key as opposed to
BOOT/verity_key. Also refactor the verity key replacement lines.
Bug:
29397395
Test: 'sign_target_files_apks.py --replace_verity_private_key newkey --replace_verity_public_key newkey.pub target_files.zip signed-target_files.zip' and verify the replaced key in boot.img.
Change-Id: I58a5defff4be008ad55d4b5a5b7148569c3b8d66
Jeff Vander Stoep [Thu, 23 Jun 2016 22:04:24 +0000 (15:04 -0700)]
resolve merge conflicts of
012144f to nyc-dev
Change-Id: If918f56d5c33db10978b4efc51cf3fe42ed71f1a
Ian Pedowitz [Thu, 23 Jun 2016 22:00:24 +0000 (22:00 +0000)]
Merge "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""" into nyc-mr1-dev
Roozbeh Pournader [Thu, 23 Jun 2016 21:52:35 +0000 (21:52 +0000)]
Merge "Revert "Add Serbian in Latin script to the full locale list" [DO NOT MERGE]" into nyc-mr1-dev
Daniel Micay [Thu, 23 Jun 2016 21:10:35 +0000 (21:10 +0000)]
Merge \\\"disable unpriv perf by default in user{,debug} builds\\\" into mnc-dev am:
11c84f95fb am:
a0c61fc832
am:
3cceebf11e
Change-Id: Ia91276546041b5e36ddeeb4d855d8efac6101da5
Jeffrey Vander Stoep [Thu, 23 Jun 2016 21:07:28 +0000 (21:07 +0000)]
Merge \\"disable unpriv perf by default in user{,debug} builds\\" into mnc-dev am:
11c84f95fb
am:
a0c61fc832
Change-Id: I3eb533e3084fe53f1739a0428ffe5ff583b1ba91
Daniel Micay [Thu, 23 Jun 2016 21:04:53 +0000 (21:04 +0000)]
Merge \"disable unpriv perf by default in user{,debug} builds\" into mnc-dev
am:
11c84f95fb
Change-Id: Ic82b49068c2d6c834bafb01ea3f698bb9e84d1ac
Jeffrey Vander Stoep [Thu, 23 Jun 2016 21:00:03 +0000 (21:00 +0000)]
Merge "disable unpriv perf by default in user{,debug} builds" into mnc-dev
Roozbeh Pournader [Thu, 23 Jun 2016 20:03:44 +0000 (20:03 +0000)]
Revert "Add Serbian in Latin script to the full locale list" [DO NOT MERGE]
This reverts commit
4c6e1b62e09310fb0a688a6bd6ccf560b1c96d9f, since sr-Latn is no longer planned for MR1.
Bug:
29455508
Bug:
29601930
Change-Id: I47c240fa7456940ecb272f05e94f563b221c92c3
Ian Pedowitz [Thu, 23 Jun 2016 19:09:22 +0000 (19:09 +0000)]
Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""
This reverts commit
dc15ebc26cbf88dcba74aea1f005a1794c779ee6.
Fixes:
29117805
Bug:
28809789
Change-Id: I52ff3d0450928bfdc3035c1e9991741c7bcf14d0
Baligh Uddin [Wed, 22 Jun 2016 19:14:16 +0000 (12:14 -0700)]
Add ability to pass in payload_signer args
Bug:
28701652
Change-Id: I110d5fc14446e4a6a0f8e25dcb0d300decdf09a4
Andreas Gampe [Thu, 23 Jun 2016 02:50:45 +0000 (02:50 +0000)]
Merge changes Ib4412657,I73e6d479 into nyc-mr1-dev am:
fbe2eedb28
am:
d35dcb9092
Change-Id: Ib3f30e3319a7092bc58564d77e0a22ef56709670
Andreas Gampe [Thu, 23 Jun 2016 02:39:38 +0000 (02:39 +0000)]
Merge changes Ib4412657,I73e6d479 into nyc-mr1-dev
am:
fbe2eedb28
Change-Id: I5ba3ae957001974e33d6d6f49d542c05b9c13aba
TreeHugger Robot [Thu, 23 Jun 2016 02:30:21 +0000 (02:30 +0000)]
Merge changes Ib4412657,I73e6d479 into nyc-mr1-dev
* changes:
Build: Add option to restrict sanitization by owner
Build: Add option to restrict sanitization by architecture
Alex Klyubin [Thu, 23 Jun 2016 00:47:57 +0000 (00:47 +0000)]
Merge \\\\"Use Builder pattern for ApkVerifier parameters.\\\\" am:
744e7746c4 am:
7dbd1ea408 am:
ef11808f84
am:
e3e4b206c9
Change-Id: Ib8eb6a2308697efb7a3268079a2e776f8d97cf58
Alex Klyubin [Thu, 23 Jun 2016 00:42:43 +0000 (00:42 +0000)]
Merge \\\"Use Builder pattern for ApkVerifier parameters.\\\" am:
744e7746c4 am:
7dbd1ea408
am:
ef11808f84
Change-Id: I9e851e7e32ceab8ea35b4f31bf51d63046336484
Alex Klyubin [Thu, 23 Jun 2016 00:40:11 +0000 (00:40 +0000)]
Merge \\"Use Builder pattern for ApkVerifier parameters.\\" am:
744e7746c4
am:
7dbd1ea408
Change-Id: I425095197f451a3ea089cea75da13fbb01036f43
Alex Klyubin [Thu, 23 Jun 2016 00:37:28 +0000 (00:37 +0000)]
Merge \"Use Builder pattern for ApkVerifier parameters.\"
am:
744e7746c4
Change-Id: I36d18044ea627ff9f5f83ef8463476de07ce45ff
Andreas Gampe [Tue, 21 Jun 2016 00:46:29 +0000 (17:46 -0700)]
Build: Add option to restrict sanitization by owner
Add Make variable SANITIZE_NEVER_BY_OWNER to selectively
sanitize modules. By default, both are being sanitized. The
value of the variable is interpreted as a space or colon
separated list of owner names.
This can be used to create builds that lower the sanitization
burden by not sanitizing parts of the platform.
Bug:
29498013
Change-Id: Ib4412657fd38ff28a5c0863eddc2acde63c88ebb
Treehugger Robot [Thu, 23 Jun 2016 00:31:53 +0000 (00:31 +0000)]
Merge "Use Builder pattern for ApkVerifier parameters."
Daniel Nishi [Wed, 22 Jun 2016 23:59:11 +0000 (23:59 +0000)]
Merge \\"Add the StorageManager APK to the core build.\\" into nyc-mr1-dev am:
36ae59228c
am:
3893beb80f
Change-Id: Iee59dd73f3ee98fc52e87a2e4182f9a15d3c816a
Daniel Nishi [Wed, 22 Jun 2016 23:56:23 +0000 (23:56 +0000)]
Merge \"Add the StorageManager APK to the core build.\" into nyc-mr1-dev
am:
36ae59228c
Change-Id: I09c099f3cbeee26b91a8de56b794c5e6cc581d9f
Daniel Nishi [Wed, 22 Jun 2016 23:50:07 +0000 (23:50 +0000)]
Merge "Add the StorageManager APK to the core build." into nyc-mr1-dev
Alex Klyubin [Tue, 21 Jun 2016 17:46:56 +0000 (10:46 -0700)]
Use Builder pattern for ApkVerifier parameters.
This should make it easier to add parameters/options without breaking
existing clients.
Bug:
27461702
Change-Id: Ia4577f78d703a6b91828dd08492c78d5e9afb110
Badhri Jagan Sridharan [Wed, 22 Jun 2016 21:07:15 +0000 (21:07 +0000)]
Merge \\"releasetools: replace verity keyid\\" into nyc-mr1-dev am:
05dcc3718a
am:
ed25565e63
Change-Id: I84c2bc8fd40f50d8fec279a2b4755062fc17a263
Badhri Jagan Sridharan [Wed, 22 Jun 2016 20:59:55 +0000 (20:59 +0000)]
Merge \"releasetools: replace verity keyid\" into nyc-mr1-dev
am:
05dcc3718a
Change-Id: I0e9e1b1b2b9ca826de09b81925760c19697b39dc
Dan Willemsen [Wed, 22 Jun 2016 20:59:28 +0000 (20:59 +0000)]
Merge \\\\"Finish refactoring tests to NATIVE_TESTS\\\\" am:
239f2b0f9f am:
fed8d9e9f7 am:
24260479f3
am:
ceae196483
Change-Id: I377895553af34a1880e4cbaae1b9400adc0c8c0f
Badhri Jagan Sridharan [Wed, 22 Jun 2016 20:54:20 +0000 (20:54 +0000)]
Merge "releasetools: replace verity keyid" into nyc-mr1-dev
Dan Willemsen [Wed, 22 Jun 2016 20:47:14 +0000 (20:47 +0000)]
Merge \\\"Finish refactoring tests to NATIVE_TESTS\\\" am:
239f2b0f9f am:
fed8d9e9f7
am:
24260479f3
Change-Id: I381ac62f6b2a3c1d618b48cdf1e0c90da1eb0804
Dan Willemsen [Wed, 22 Jun 2016 20:44:42 +0000 (20:44 +0000)]
Merge \\"Finish refactoring tests to NATIVE_TESTS\\" am:
239f2b0f9f
am:
fed8d9e9f7
Change-Id: I66fd8b66a0acbc2fbb653bf2d90d3a68727d14e8
Dan Willemsen [Wed, 22 Jun 2016 20:41:57 +0000 (20:41 +0000)]
Merge \"Finish refactoring tests to NATIVE_TESTS\"
am:
239f2b0f9f
Change-Id: If34f994893a9ad00cadb3a6124ee21ccf36b142c
Treehugger Robot [Wed, 22 Jun 2016 20:37:40 +0000 (20:37 +0000)]
Merge "Finish refactoring tests to NATIVE_TESTS"
Dan Willemsen [Wed, 22 Jun 2016 07:27:54 +0000 (00:27 -0700)]
Finish refactoring tests to NATIVE_TESTS
Now that the source trees all use NATIVE_TESTS for intermediate files
and generated sources, make it a requirement.
Change-Id: Id5718fabe63f6e8dde7981a6f0f5bd89e0ec7ee5
Tianjie Xu [Wed, 22 Jun 2016 05:22:53 +0000 (05:22 +0000)]
Merge \"Merge \\\"Limit the number of blocks in command zero\\\" into nyc-dev am:
0eade3f027 am:
9eb3260239\" into nyc-mr1-dev-plus-aosp
am:
3bbf24732b
Change-Id: I3498c7e42de63a19eb3226c3a20a05367ea1166f
Tianjie Xu [Wed, 22 Jun 2016 05:22:53 +0000 (05:22 +0000)]
Merge \\\"Limit the number of blocks in command zero\\\" into nyc-dev am:
0eade3f027 am:
5371829b86
am:
540e8d53df
Change-Id: I15d29c64d1a67227577ea8943d7e58e1f92e2feb
Android Build Merger (Role) [Wed, 22 Jun 2016 05:20:30 +0000 (05:20 +0000)]
Merge "Merge \\"Limit the number of blocks in command zero\\" into nyc-dev am:
0eade3f027 am:
9eb3260239" into nyc-mr1-dev-plus-aosp
Tianjie Xu [Wed, 22 Jun 2016 05:20:18 +0000 (05:20 +0000)]
Merge \\"Limit the number of blocks in command zero\\" into nyc-dev am:
0eade3f027
am:
9eb3260239
Change-Id: I9a6064f50b529253f227d5be0ea5385abaa3fa4b
Tianjie Xu [Wed, 22 Jun 2016 05:20:16 +0000 (05:20 +0000)]
Merge \\"Limit the number of blocks in command zero\\" into nyc-dev am:
0eade3f027
am:
5371829b86
Change-Id: If8b26c8dfb6c184ea6295b1174f58c280eb8df31
Tianjie Xu [Wed, 22 Jun 2016 05:17:42 +0000 (05:17 +0000)]
Merge \"Limit the number of blocks in command zero\" into nyc-dev
am:
0eade3f027
Change-Id: I7f5cc1319863eb1ec1d87b6bf3e9cb62f3401e41
Tianjie Xu [Wed, 22 Jun 2016 05:17:40 +0000 (05:17 +0000)]
Merge \"Limit the number of blocks in command zero\" into nyc-dev
am:
0eade3f027
Change-Id: I56afbc6fed2d79d2ab71a35577739c96d779de6e
Tianjie Xu [Wed, 22 Jun 2016 05:11:24 +0000 (05:11 +0000)]
Merge "Limit the number of blocks in command zero" into nyc-dev
Zach Jang [Wed, 22 Jun 2016 01:56:24 +0000 (01:56 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94 am:
9fc3cf7ba2 am:
3749025ccb am:
e7bc1542db am:
1be6c69524 am:
1f87a820ad am:
113239bed6
am:
e685777ac4
Change-Id: I6d933a747b0a9cedafd0849b178ddd2e08cfc415
Zach Jang [Wed, 22 Jun 2016 01:56:24 +0000 (01:56 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94 am:
9fc3cf7ba2 am:
3749025ccb am:
e7bc1542db am:
1be6c69524 am:
1f87a820ad am:
a36f36dcc0
am:
248a5b2bf9
Change-Id: I32697586cd1781d60b6b3ad6309acb38d2d176cb
Zach Jang [Wed, 22 Jun 2016 01:51:28 +0000 (01:51 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94 am:
9fc3cf7ba2 am:
3749025ccb am:
e7bc1542db am:
1be6c69524 am:
1f87a820ad
am:
113239bed6
Change-Id: I4ab7f8ce0b6c3a70e0ee442b96295e832982d6dc
Zach Jang [Wed, 22 Jun 2016 01:49:56 +0000 (01:49 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94 am:
9fc3cf7ba2 am:
3749025ccb am:
e7bc1542db am:
1be6c69524 am:
1f87a820ad
am:
a36f36dcc0
Change-Id: If03ecbb95d14127d9534aecd20da984b2fd65d1c
Zach Jang [Wed, 22 Jun 2016 01:46:17 +0000 (01:46 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94 am:
9fc3cf7ba2 am:
3749025ccb am:
e7bc1542db am:
1be6c69524
am:
1f87a820ad
Change-Id: If484b9ee55f16b85cead3587d08c757ae8df6d2b
Zach Jang [Wed, 22 Jun 2016 01:46:17 +0000 (01:46 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94 am:
9fc3cf7ba2 am:
3749025ccb am:
e7bc1542db am:
1be6c69524
am:
1f87a820ad
Change-Id: I7fa8b6b8fc732a24d3c058d02a5568abab52028b
Zach Jang [Wed, 22 Jun 2016 01:43:47 +0000 (01:43 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94 am:
9fc3cf7ba2 am:
3749025ccb am:
e7bc1542db
am:
1be6c69524
Change-Id: If5d6ea4889550f45ef2a8f0ebf53a1e656c39010
Zach Jang [Wed, 22 Jun 2016 01:41:13 +0000 (01:41 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94 am:
9fc3cf7ba2 am:
3749025ccb
am:
e7bc1542db
Change-Id: I316c25839b0e111bda05ba586733e3712eda5a32
Guang Zhu [Wed, 22 Jun 2016 01:39:01 +0000 (01:39 +0000)]
Merge \\\\"move test artifact build rules into open source location\\\\" am:
59e060e1c6 am:
c8e8f38faa am:
49e12eab71
am:
906013688e
Change-Id: Ia81ae638decabedaef711215742e4d68b9e3ddb0
Zach Jang [Wed, 22 Jun 2016 01:38:31 +0000 (01:38 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94 am:
9fc3cf7ba2
am:
3749025ccb
Change-Id: Idadb32ede7b3699e0db8ce632d37e7d2cf99e82b
Zach Jang [Wed, 22 Jun 2016 01:35:58 +0000 (01:35 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94
am:
9fc3cf7ba2
Change-Id: Idcd5da62fd7c36da94af3a15f35d179e1a3940f2
Zach Jang [Wed, 22 Jun 2016 01:33:23 +0000 (01:33 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29
am:
cbf1e2cc94
Change-Id: I72cff95d6f8878b5d3707f0b0f9c0541c89b9aa5
Zach Jang [Wed, 22 Jun 2016 01:30:23 +0000 (01:30 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40
am:
cf51c6cb29
Change-Id: Id5206a36ff4cee1de3e15f9d5efc64ee731434ee
Zach Jang [Wed, 22 Jun 2016 01:27:49 +0000 (01:27 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev
am:
0c672afc40
Change-Id: Ibfaa4fa1c68fff09bbee52855a99e296bb603d45
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
Guang Zhu [Wed, 22 Jun 2016 01:06:01 +0000 (01:06 +0000)]
Merge \\\"move test artifact build rules into open source location\\\" am:
59e060e1c6 am:
c8e8f38faa
am:
49e12eab71
Change-Id: I7827af9a7b1c8054d7debde722d4c9cabac97ace
Guang Zhu [Wed, 22 Jun 2016 01:00:44 +0000 (01:00 +0000)]
Merge \\"move test artifact build rules into open source location\\" am:
59e060e1c6
am:
c8e8f38faa
Change-Id: I81bf4856cb2489e7983b0859df3dc36f2bee2e01
Guang Zhu [Wed, 22 Jun 2016 00:52:30 +0000 (00:52 +0000)]
Merge \"move test artifact build rules into open source location\"
am:
59e060e1c6
Change-Id: I5bb807dec5cffc0a60f28f54341c83f6c4224d10
Treehugger Robot [Wed, 22 Jun 2016 00:47:27 +0000 (00:47 +0000)]
Merge "move test artifact build rules into open source location"
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
Tianjie Xu [Tue, 21 Jun 2016 23:39:57 +0000 (23:39 +0000)]
Merge \\"Limit the number of blocks in command zero\\" into nyc-mr1-dev am:
7112b50252
am:
8fe72d5479
Change-Id: Ia8ae37456e09e2de6e0df68da653f99aa2447987
Tianjie Xu [Tue, 21 Jun 2016 23:37:25 +0000 (23:37 +0000)]
Merge \"Limit the number of blocks in command zero\" into nyc-mr1-dev
am:
7112b50252
Change-Id: I30e4a669f0d7b819acc97ad6ca4ed5af666d994a
OSDN Git Service
