OSDN Git Service
gitbuildkicker [Tue, 8 Nov 2016 08:08:29 +0000 (00:08 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
gitbuildkicker [Mon, 7 Nov 2016 08:08:42 +0000 (00:08 -0800)]
N2F38
gitbuildkicker [Mon, 7 Nov 2016 08:08:16 +0000 (00:08 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
Tao Bao [Mon, 24 Oct 2016 23:49:08 +0000 (16:49 -0700)]
releasetools: Make BBOTA incremental generation repeatable.
set() doesn't keep elements according to the order of insertion. So
Transfers managed with set() in intermediate steps may not appear in the
same order across runs. This leads to slightly different output packages
when generating the same incremental OTA.
This CL fixes the issue by replacing set() with OrderedDict() in
blockimgdiff.GenerateDigraph() and blockimgdiff.FindVertexSequence().
It also adds a testcase that ensures blockimgdiff.GenerateDigraph()
preserves the insertion order for Transfer.goes_after set.
Bug:
32220816
Test: ota_from_target_files.py gives identical package when running
multiple times.
Change-Id: I56d551e5ca926993ab46896e33c80e0ce42e506a
(cherry picked from commit
334822842353669df47cec08500d4497b4b353ea)
gitbuildkicker [Sun, 6 Nov 2016 07:15:21 +0000 (00:15 -0700)]
N2F37
gitbuildkicker [Sun, 6 Nov 2016 07:08:33 +0000 (00:08 -0700)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
gitbuildkicker [Thu, 3 Nov 2016 21:49:21 +0000 (14:49 -0700)]
N2F34B
gitbuildkicker [Thu, 3 Nov 2016 07:11:06 +0000 (00:11 -0700)]
N2F34
gitbuildkicker [Thu, 3 Nov 2016 07:08:33 +0000 (00:08 -0700)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
gitbuildkicker [Wed, 2 Nov 2016 07:09:39 +0000 (00:09 -0700)]
N2F33
gitbuildkicker [Wed, 2 Nov 2016 07:08:18 +0000 (00:08 -0700)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
Ian Pedowitz [Tue, 1 Nov 2016 03:44:25 +0000 (20:44 -0700)]
DO NOT MERGE Nougat MR2 is 7.1.2
Fixes:
32335870
Change-Id: I2b0f7e0f9506704a391930f6f9c2a4cf9c550a7f
gitbuildkicker [Tue, 1 Nov 2016 07:11:32 +0000 (00:11 -0700)]
N2F32
gitbuildkicker [Tue, 1 Nov 2016 07:08:26 +0000 (00:08 -0700)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
gitbuildkicker [Mon, 31 Oct 2016 07:08:48 +0000 (00:08 -0700)]
N2F31
gitbuildkicker [Mon, 31 Oct 2016 07:08:15 +0000 (00:08 -0700)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
gitbuildkicker [Sun, 30 Oct 2016 07:12:24 +0000 (00:12 -0700)]
N2F30
gitbuildkicker [Sun, 30 Oct 2016 07:08:30 +0000 (00:08 -0700)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
Alexander Levitskiy [Thu, 27 Oct 2016 20:56:45 +0000 (20:56 +0000)]
Merge "build: tools: Add json collection of installed files with hashes." into cw-f-dev
am:
343d72fac8
Change-Id: I67666e5d436492c53632e0bae9bae51f652619f0
Sasha Levitskiy [Thu, 27 Oct 2016 20:56:44 +0000 (20:56 +0000)]
build: tools: Add json collection of installed files with hashes.
am:
3c97fa78cd
Change-Id: I5eb12808bbb82a4b9aeaa76b32d971ee4d2643ba
Alexander Levitskiy [Thu, 27 Oct 2016 20:51:14 +0000 (20:51 +0000)]
Merge "build: tools: Add json collection of installed files with hashes." into cw-f-dev
gitbuildkicker [Thu, 27 Oct 2016 07:11:14 +0000 (00:11 -0700)]
N2F27
gitbuildkicker [Thu, 27 Oct 2016 07:08:29 +0000 (00:08 -0700)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
Tao Bao [Wed, 26 Oct 2016 22:26:59 +0000 (22:26 +0000)]
releasetools: Support verity signer args. am:
c7814837a0 am:
8a6d94c9aa am:
b31f486d75
am:
53a1acf53b
Change-Id: Id991b143b4adf579148380b1191a62413f0376bb
Tao Bao [Wed, 26 Oct 2016 22:22:58 +0000 (22:22 +0000)]
releasetools: Support verity signer args. am:
c7814837a0 am:
8a6d94c9aa
am:
b31f486d75
Change-Id: I871181398a41da89f1851a0b9a5599de23f6100e
Tao Bao [Wed, 26 Oct 2016 22:18:28 +0000 (22:18 +0000)]
releasetools: Support verity signer args. am:
c7814837a0
am:
8a6d94c9aa
Change-Id: I3383bfa1920dad8976963813dd73435f19cb6593
Tao Bao [Wed, 26 Oct 2016 22:13:27 +0000 (22:13 +0000)]
releasetools: Support verity signer args.
am:
c7814837a0
Change-Id: Ie5ba1d9b706eacae6d6d2f52624526521301c724
gitbuildkicker [Wed, 26 Oct 2016 07:11:01 +0000 (00:11 -0700)]
N2F26
gitbuildkicker [Wed, 26 Oct 2016 07:08:30 +0000 (00:08 -0700)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
Tao Bao [Mon, 17 Oct 2016 23:20:12 +0000 (16:20 -0700)]
releasetools: Support verity signer args.
system/extras/verity/build_verity_metadata.py now accepts
"--signer_args" to specify verity signer args.
Also remove the duplicate "--verity_signer_args" in
add_img_to_target_files.py, as we already have that in common.py.
Bug:
31500665
Test: Building and signing work w/ and w/o --signer_args.
Change-Id: I02f59c50a1ebf15c5505e9fffd5b9bbbbaa785be
(cherry picked from commit
458104266f52e1d92fbde057496f621aa16084cc)
gitbuildkicker [Tue, 25 Oct 2016 15:17:27 +0000 (08:17 -0700)]
N2F25
gitbuildkicker [Tue, 25 Oct 2016 15:16:39 +0000 (08:16 -0700)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
Bill Rassieur [Mon, 24 Oct 2016 15:14:07 +0000 (08:14 -0700)]
N2F24 - prime the buildid for nyc-mr2-release.
BUG:
32337091
Change-Id: Ieb3abce386505e2926be109aef22385ee4d3c29f
Baligh Uddin [Mon, 24 Oct 2016 03:58:02 +0000 (20:58 -0700)]
Empty commit to trigger build
Flavio Lerda [Fri, 21 Oct 2016 06:32:18 +0000 (06:32 +0000)]
Merge "Change name of overlay subdir 'sku'->'theme'" into cw-f-dev
Lingfeng Yang [Fri, 21 Oct 2016 00:24:21 +0000 (00:24 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow /dev/goldfish_sync" into nyc-mr1-dev
am:
fdf2530f33 -s ours
Change-Id: Ibf9304345439ddf50d19726e184e8ff714748004
Lingfeng Yang [Fri, 21 Oct 2016 00:23:08 +0000 (00:23 +0000)]
DO NOT MERGE ANYWHERE Allow /dev/goldfish_sync
am:
9b73b62240 -s ours
Change-Id: Id9837232171ff871a6ef112d673393e39f362707
TreeHugger Robot [Fri, 21 Oct 2016 00:13:55 +0000 (00:13 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow /dev/goldfish_sync" into nyc-mr1-dev
Lingfeng Yang [Tue, 10 May 2016 21:51:57 +0000 (14:51 -0700)]
DO NOT MERGE ANYWHERE Allow /dev/goldfish_sync
manual cherry pick of:
https://googleplex-android-review.git.corp.google.com/#/c/
1024926/
Change-Id: I41883eafd2b261d000c41eaf3ba04af7e2b89349
Sasha Levitskiy [Tue, 11 Oct 2016 05:48:10 +0000 (22:48 -0700)]
build: tools: Add json collection of installed files with hashes.
Adds installed-files.json in addition to installed-files.txt
Further sorts the file list to be ordered within the same size bucket.
Test: manual, cross-checked checksums with sha256sum utility
checked build outputs.
Bug:
19988819
Merged-in: Ifb632eb4df65ec48645c8f93e36bae44ccc52ba8
Change-Id: Ifb632eb4df65ec48645c8f93e36bae44ccc52ba8
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Adam Seaton [Wed, 19 Oct 2016 20:13:47 +0000 (20:13 +0000)]
Update Security string to 2016-12-05 am:
873455ef7c am:
f058324a71 am:
ed54753f7a -s ours am:
0b34d13069 am:
919213d346 am:
199fa7c6cc am:
b5beda11a4 am:
c07ff401f2 am:
fee7a82fe3
am:
a457c10023
Change-Id: I58dd15d5eeb9e71aff2d9918878439d2e74c835e
Adam Seaton [Wed, 19 Oct 2016 20:13:41 +0000 (20:13 +0000)]
Update Security String to 2016-12-01 am:
bacdf263ee am:
c8ce9e6e00 am:
7c0f193b7f -s ours am:
5d3d63700d am:
3593bce5d9 am:
ddadcf3b9b am:
921874162d am:
cd06a5cb89 am:
f4f02f8e3d
am:
52eeb54b22
Change-Id: I46e8b8a639136c2850ac646e2bd4a7f3d47b59d4
Adam Seaton [Wed, 19 Oct 2016 19:59:17 +0000 (19:59 +0000)]
Update Security string to 2016-12-05 am:
873455ef7c am:
f058324a71 am:
ed54753f7a -s ours am:
0b34d13069 am:
919213d346 am:
199fa7c6cc am:
b5beda11a4 am:
c07ff401f2
am:
fee7a82fe3
Change-Id: Iec75406b0051e3f14806a2f137dce02beff93116
Adam Seaton [Wed, 19 Oct 2016 19:59:11 +0000 (19:59 +0000)]
Update Security String to 2016-12-01 am:
bacdf263ee am:
c8ce9e6e00 am:
7c0f193b7f -s ours am:
5d3d63700d am:
3593bce5d9 am:
ddadcf3b9b am:
921874162d am:
cd06a5cb89
am:
f4f02f8e3d
Change-Id: If60d9ad9f2ffe8c7bb7d4f7f8dd0028436e716b9
Adam Seaton [Wed, 19 Oct 2016 19:30:45 +0000 (19:30 +0000)]
Update Security string to 2016-12-05 am:
873455ef7c am:
f058324a71 am:
ed54753f7a -s ours am:
0b34d13069 am:
919213d346 am:
199fa7c6cc am:
b5beda11a4
am:
c07ff401f2
Change-Id: Idbd4af1806205475c483ce61a18d07121735860a
Adam Seaton [Wed, 19 Oct 2016 19:30:40 +0000 (19:30 +0000)]
Update Security String to 2016-12-01 am:
bacdf263ee am:
c8ce9e6e00 am:
7c0f193b7f -s ours am:
5d3d63700d am:
3593bce5d9 am:
ddadcf3b9b am:
921874162d
am:
cd06a5cb89
Change-Id: I73afd09934f7608b74a68ffff442fd1a02a90244
Adam Seaton [Wed, 19 Oct 2016 19:23:14 +0000 (19:23 +0000)]
Update Security string to 2016-12-05 am:
873455ef7c am:
f058324a71 am:
ed54753f7a -s ours am:
0b34d13069 am:
919213d346 am:
199fa7c6cc
am:
b5beda11a4
Change-Id: I10594ed3bac5013295ea4c02ca3a86e1ea92d0d9
Adam Seaton [Wed, 19 Oct 2016 19:23:09 +0000 (19:23 +0000)]
Update Security String to 2016-12-01 am:
bacdf263ee am:
c8ce9e6e00 am:
7c0f193b7f -s ours am:
5d3d63700d am:
3593bce5d9 am:
ddadcf3b9b
am:
921874162d
Change-Id: Ic0298376eed68fc1616eff990cb09557bc7df9d8
Adam Seaton [Wed, 19 Oct 2016 19:15:43 +0000 (19:15 +0000)]
Updating Security String to 2016-12-05 am:
5a24d75e18 am:
f8b8b3cbcd am:
f4a72db8f4 am:
045d2ceb56 -s ours am:
0c131fdf83 am:
9158ba04d4
am:
8ed92a4f9b
Change-Id: I22be5c89f51ede84462febd80d189be894c9e5f3
Adam Seaton [Wed, 19 Oct 2016 19:15:42 +0000 (19:15 +0000)]
Update Security string to 2016-12-05 am:
873455ef7c am:
f058324a71 am:
ed54753f7a -s ours am:
0b34d13069 am:
919213d346
am:
199fa7c6cc
Change-Id: Id145655b1cadeef1dfb8fe963b3509a8ea07ebfe
Adam Seaton [Wed, 19 Oct 2016 19:15:38 +0000 (19:15 +0000)]
Update Security String to 2016-12-01 am:
bacdf263ee am:
c8ce9e6e00 am:
7c0f193b7f -s ours am:
5d3d63700d am:
3593bce5d9
am:
ddadcf3b9b
Change-Id: I0fb72e12a834e262037427d441ad80a2ea45f29d
Adam Seaton [Wed, 19 Oct 2016 19:15:38 +0000 (19:15 +0000)]
Updating Security String to 2016-12-01 am:
5807b41cf3 am:
098ffeec15 am:
6e56e13b17 am:
593e111a03 -s ours am:
f8338191de am:
d1bcc8fc2f
am:
c6943d6c0a
Change-Id: I0a1f3d0259dbfc8609bd100572c12b9b4bbdab75
Jakub Adamek [Wed, 19 Oct 2016 10:42:51 +0000 (11:42 +0100)]
Change name of overlay subdir 'sku'->'theme'
The name 'sku' does not fit well as we recommend to use the same
value for different SKUs if vendors wish to have the same colors
on those SKUs.
Bug:
32268656
Change-Id: Ibb29279343058724808e27ddf2be0d0da36b1312
Adam Seaton [Wed, 19 Oct 2016 19:07:43 +0000 (19:07 +0000)]
Updating Security String to 2016-12-05 am:
5a24d75e18 am:
f8b8b3cbcd am:
f4a72db8f4 am:
045d2ceb56 -s ours am:
0c131fdf83
am:
9158ba04d4
Change-Id: I548ddfa9be7f7131f08bbe4fd2d623397c7334b1
Adam Seaton [Wed, 19 Oct 2016 19:07:38 +0000 (19:07 +0000)]
Updating Security String to 2016-12-01 am:
5807b41cf3 am:
098ffeec15 am:
6e56e13b17 am:
593e111a03 -s ours am:
f8338191de
am:
d1bcc8fc2f
Change-Id: I6d0e41b40ce54412db6b0080fb5759b9e0280dd2
Adam Seaton [Wed, 19 Oct 2016 19:07:12 +0000 (19:07 +0000)]
Update Security string to 2016-12-05 am:
873455ef7c am:
f058324a71 am:
ed54753f7a -s ours am:
0b34d13069
am:
919213d346
Change-Id: Ie504da29653ef9766bf5015f18125ad51331fbfa
Adam Seaton [Wed, 19 Oct 2016 19:07:07 +0000 (19:07 +0000)]
Update Security String to 2016-12-01 am:
bacdf263ee am:
c8ce9e6e00 am:
7c0f193b7f -s ours am:
5d3d63700d
am:
3593bce5d9
Change-Id: I5178214a38499819b5095f232f698b3b3e2bc3a3
Adam Seaton [Wed, 19 Oct 2016 18:59:14 +0000 (18:59 +0000)]
Updating Security String to 2016-12-05 am:
5a24d75e18 am:
f8b8b3cbcd am:
f4a72db8f4 am:
045d2ceb56 -s ours
am:
0c131fdf83
Change-Id: Iab874fc2db8e931f85823fb8c8001e7455f48e46
Adam Seaton [Wed, 19 Oct 2016 18:59:13 +0000 (18:59 +0000)]
Update Security string to 2016-12-05 am:
873455ef7c am:
f058324a71 am:
ed54753f7a -s ours
am:
0b34d13069
Change-Id: I94fa8d685a5948f9fc24a5032ce9b86971e4a389
Adam Seaton [Wed, 19 Oct 2016 18:59:08 +0000 (18:59 +0000)]
Updating Security String to 2016-12-01 am:
5807b41cf3 am:
098ffeec15 am:
6e56e13b17 am:
593e111a03 -s ours
am:
f8338191de
Change-Id: I122fb00a707cc0e0468645847181a1c05377d3a0
Adam Seaton [Wed, 19 Oct 2016 18:59:08 +0000 (18:59 +0000)]
Update Security String to 2016-12-01 am:
bacdf263ee am:
c8ce9e6e00 am:
7c0f193b7f -s ours
am:
5d3d63700d
Change-Id: I837623a12bc7a322ad3c0fad980d53762dc1ae15
Adam Seaton [Wed, 19 Oct 2016 18:51:12 +0000 (18:51 +0000)]
Update Security string to 2016-12-05 am:
873455ef7c am:
f058324a71
am:
ed54753f7a -s ours
Change-Id: I82ca0400f4b8b32728e26b73226e0c958f9f5551
Adam Seaton [Wed, 19 Oct 2016 18:51:07 +0000 (18:51 +0000)]
Update Security String to 2016-12-01 am:
bacdf263ee am:
c8ce9e6e00
am:
7c0f193b7f -s ours
Change-Id: If849652da13a9b39530aed0c6ed4691586b13cd4
Adam Seaton [Wed, 19 Oct 2016 18:50:45 +0000 (18:50 +0000)]
Updating Security String to 2016-12-05 am:
5a24d75e18 am:
f8b8b3cbcd am:
f4a72db8f4
am:
045d2ceb56 -s ours
Change-Id: I240939bac6abc89c7a4cd2bb937991d8a757221a
Adam Seaton [Wed, 19 Oct 2016 18:50:38 +0000 (18:50 +0000)]
Updating Security String to 2016-12-01 am:
5807b41cf3 am:
098ffeec15 am:
6e56e13b17
am:
593e111a03 -s ours
Change-Id: I0451a596cb64421bcb3a87f33b888f11d39991c6
Adam Seaton [Wed, 19 Oct 2016 17:50:37 +0000 (17:50 +0000)]
Updating Security String to 2016-12-05 am:
5a24d75e18 am:
f8b8b3cbcd
am:
f4a72db8f4
Change-Id: I7b98ce45c10c0f8fee4bab5718fb577307cf6bf7
Adam Seaton [Wed, 19 Oct 2016 17:50:37 +0000 (17:50 +0000)]
Updating Security String to 2016-12-05 am:
38dcf47813 am:
71e1b726e2
am:
e6b85b662f
Change-Id: Ib1eebc264c6babbfdd4e31b74fcb2b0042288da0
Adam Seaton [Wed, 19 Oct 2016 17:50:33 +0000 (17:50 +0000)]
Updating Security String to 2016-12-01 am:
5807b41cf3 am:
098ffeec15
am:
6e56e13b17
Change-Id: I322a8c360eaf964fd278ff71a4c6d0cc50067598
Adam Seaton [Wed, 19 Oct 2016 17:50:32 +0000 (17:50 +0000)]
Updating Security String to 2016-12-01 am:
1f7c92c5db am:
c9c0ba7572
am:
caee659bc7
Change-Id: I4f50d940566865be021ceda6730c47d2cb29cecd
Adam Seaton [Wed, 19 Oct 2016 17:44:06 +0000 (17:44 +0000)]
Updating Security String to 2016-12-05 am:
38dcf47813
am:
71e1b726e2
Change-Id: I0ae4f763e19f9db41a748aa3ce79775e2bd2946c
Adam Seaton [Wed, 19 Oct 2016 17:44:01 +0000 (17:44 +0000)]
Updating Security String to 2016-12-01 am:
1f7c92c5db
am:
c9c0ba7572
Change-Id: I4bdf3f3f69f7c2220bd328586e61a75fd765ea5c
Adam Seaton [Wed, 19 Oct 2016 17:43:36 +0000 (17:43 +0000)]
Updating Security String to 2016-12-05 am:
5a24d75e18
am:
f8b8b3cbcd
Change-Id: Ie1aafec62c5f233636849175cd2a09304713bd57
Adam Seaton [Wed, 19 Oct 2016 17:43:32 +0000 (17:43 +0000)]
Updating Security String to 2016-12-01 am:
5807b41cf3
am:
098ffeec15
Change-Id: I9627dc11333919b128959778b9286341a55763f4
Adam Seaton [Wed, 19 Oct 2016 17:43:07 +0000 (17:43 +0000)]
Update Security string to 2016-12-05 am:
873455ef7c
am:
f058324a71
Change-Id: I40080e46b38bb650162d1e3fee6672e711b717a1
Adam Seaton [Wed, 19 Oct 2016 17:43:02 +0000 (17:43 +0000)]
Update Security String to 2016-12-01 am:
bacdf263ee
am:
c8ce9e6e00
Change-Id: I7955c93d97fb04f2781a0163dc63268320f1de5e
Adam Seaton [Wed, 19 Oct 2016 17:36:12 +0000 (17:36 +0000)]
Updating Security String to 2016-12-05
am:
38dcf47813
Change-Id: I3fd8785e5b66fc27cf589f9172445081c5051be8
Adam Seaton [Wed, 19 Oct 2016 17:36:08 +0000 (17:36 +0000)]
Updating Security String to 2016-12-05
am:
5a24d75e18
Change-Id: I9e7c3dd1e7970da50cb77ff6691dbc7daeb5d2aa
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:05 +0000 (17:36 +0000)]
Updating Security String to 2016-12-01
am:
1f7c92c5db
Change-Id: I48dbe98c5b7ec8270acde0c4bca570cf9acb1ffa
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 [Wed, 19 Oct 2016 17:36:02 +0000 (17:36 +0000)]
Updating Security String to 2016-12-01
am:
5807b41cf3
Change-Id: Iaf8ab098534a57aa3e5b5598f76cec377f9baf8d
Adam Seaton [Tue, 18 Oct 2016 23:30:21 +0000 (16:30 -0700)]
Updating Security String to 2016-12-05
nyc-dev
b/
32249855
Adam Seaton [Tue, 18 Oct 2016 23:29:23 +0000 (16:29 -0700)]
Updating Security String to 2016-12-01
nyc-dev
b/
32249855
Adam Seaton [Tue, 18 Oct 2016 22:19:34 +0000 (15:19 -0700)]
Updating Security String to 2016-12-05
mnc-dev
b/
32249855
Adam Seaton [Tue, 18 Oct 2016 22:18:10 +0000 (15:18 -0700)]
Updating Security String to 2016-12-01
mnc-dev
b/
32249855
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
Dirk Dougherty [Sat, 8 Oct 2016 02:35:33 +0000 (02:35 +0000)]
Fix samples metadata concat. am:
8d565ed204 am:
bafc0b1baf
am:
20e91f4e7a
Change-Id: I7e77f030b6dc45da3b22459bbd5871ff42285ba8
Dirk Dougherty [Sat, 8 Oct 2016 02:31:32 +0000 (02:31 +0000)]
Fix samples metadata concat. am:
8d565ed204
am:
bafc0b1baf
Change-Id: I21dadb32eeb771aae9c188372d0da1cf4ea16126
Dirk Dougherty [Sat, 8 Oct 2016 02:27:01 +0000 (02:27 +0000)]
Fix samples metadata concat.
am:
8d565ed204
Change-Id: I02cf4c7c04ac691b71ef48a6e584c8f2b224a6ff
Dirk Dougherty [Fri, 7 Oct 2016 19:12:50 +0000 (12:12 -0700)]
Fix samples metadata concat.
Change-Id: Ie9b616818995b3066d0e65ea1aa30077ed9d82ce
Amanda Kassay [Thu, 6 Oct 2016 17:00:02 +0000 (17:00 +0000)]
Adding excludeFromSuggestions, wear preview project path, and android wear/tv/auto/versions projectsw to template am:
b5c04107af am:
858aa63148
am:
cb5021e842
Change-Id: I899a771e0743eb6ce0eb027e4511343cf83d6624
Amanda Kassay [Thu, 6 Oct 2016 16:55:32 +0000 (16:55 +0000)]
Adding excludeFromSuggestions, wear preview project path, and android wear/tv/auto/versions projectsw to template am:
b5c04107af
am:
858aa63148
Change-Id: I6f7afd6d2c9a8b5deea04948468ddf1ccf8a6db2
Amanda Kassay [Thu, 6 Oct 2016 16:52:32 +0000 (16:52 +0000)]
Adding excludeFromSuggestions, wear preview project path, and android wear/tv/auto/versions projectsw to template
am:
b5c04107af
Change-Id: I11d773f8ca2ca9b4b20a659432d39f8c4adbef2d
Akshay Thakker [Wed, 5 Oct 2016 23:30:14 +0000 (23:30 +0000)]
Merge "Set N-MR1 to version 7.1.1." into nyc-mr1-dev
am:
d22aeb6899
Change-Id: I6ddf3c8cfc55412458e8dc5720b44154278c9a4d
Akshay Thakker [Wed, 5 Oct 2016 23:23:37 +0000 (23:23 +0000)]
Set N-MR1 to version 7.1.1.
am:
d634094543
Change-Id: I2976fd1363597b632482de6c2f9cbdc4166c7a03
TreeHugger Robot [Wed, 5 Oct 2016 23:17:38 +0000 (23:17 +0000)]
Merge "Set N-MR1 to version 7.1.1." into nyc-mr1-dev
Amanda Kassay [Wed, 5 Oct 2016 21:32:49 +0000 (17:32 -0400)]
Adding excludeFromSuggestions, wear preview project path, and android wear/tv/auto/versions projectsw to template
b/
31771704 b/
31903798 b/
31773716
Staged:
https://android-dot-devsite.googleplex.com/about/versions/nougat/index.html
https://android-dot-devsite.googleplex.com/index.html
https://android-dot-devsite.googleplex.com/wear/preview/index.html
Change-Id: Idf9893f9d108c26038ead06c84de771e21b89f37
Jakub Adámek [Wed, 5 Oct 2016 19:57:22 +0000 (19:57 +0000)]
Merge "Install runtime resource overlay without subdir." into cw-f-dev
Dan Willemsen [Wed, 5 Oct 2016 17:22:34 +0000 (17:22 +0000)]
Package up proguard jack_dictionary
am:
ea99c1da30
Change-Id: If2abc83918a7e1e229ff5233f7d49416d082a663