Alexey Polyudov
ef97891ec3
Merge branch 'master' into release
...
Change-Id: I8a6cfe28093bf3d60dc91bcbc4e98e641764c4c0
2020-07-07 12:54:19 -07:00
Himanshu Jaju
59cd56ec82
Change smhasher path
...
Changes the smhasher path to "smhasher/src/file" from "smhasher/file"
for easier import in Chromium land.
Change-Id: Ide6aa844fd8f37c9100e89d6a0bcb945b0860227
2020-07-07 12:46:30 -07:00
Alexey Polyudov
7be16eb015
Merge branch 'master' into release
...
Change-Id: I56ea2217899e92bdd9d6cb56797ac9895e194fff
2020-06-24 11:01:46 -07:00
Alexey Polyudov
412273d317
Merge branch 'google3'
...
Change-Id: I2c5f890e76873090819e7569b214af829bfd0daf
2020-06-24 10:57:51 -07:00
Alexey Polyudov
6b27a508ed
nearby: snapshot of cl/317978613
...
Signed-off-by: Alexey Polyudov <apolyudov@google.com >
Change-Id: I4bf367877a986910bb03e1c54aa972b4bcd59942
2020-06-23 19:52:26 -07:00
Alexey Polyudov
264ff0256d
Merge branch 'google3'
...
Change-Id: I08c677177d69e257e6fbe6aa32a5854e0eae8c52
2020-06-04 12:44:32 -07:00
Alexey Polyudov
04473705f8
Merge branch 'master' into release.
...
Change-Id: Id627ceca5ef60281e024ff80fc1848b3ccb6c14d
2020-06-04 12:01:48 -07:00
Himanshu Jaju
e2a07376f4
Roll forward to cl/314747126
...
Change-Id: I858d3227b44ca6d727b39fae95358df58fce9c1b
2020-06-04 19:24:33 +01:00
Alexey Polyudov
841b92e943
Merge branch 'google3'
...
this is a merge commit based on a work done here:
https://team-review.git.corp.google.com/c/nearby-eng/nearby/+/761959
the difference with the former is: this one is tracking both heads of a merge
Change-Id: I8b28b1d3a5280581f20e4edf9144641a12df8879
2020-06-04 18:08:45 +00:00
Alexey Polyudov
3e7bf3074f
Merge branch 'google3'
...
Change-Id: I8b28b1d3a5280581f20e4edf9144641a12df8879
2020-06-04 10:57:23 -07:00
Alexey Polyudov
7e19ffbab7
Release based on cl/313536507.
...
Signed-off-by: Alexey Polyudov <apolyudov@google.com >
Change-Id: I83ec7dee1a7ef6f4bdfd47482c94d03910525b7e
2020-06-04 10:06:31 -07:00
Himanshu Jaju
cffbc04508
Roll forward to cl/314549634
...
Change-Id: I4d1e7eacd5fa4078a094571ad6d5f51e422535ff
2020-06-03 11:18:32 -07:00
Alexey Polyudov
91e925c873
Merge branch 'google3'
...
Change-Id: Ibebf84b98939ee8e5006beedc34d225e8c2dd413
2020-05-28 01:36:50 -07:00
Alexey Polyudov
ae1c427b99
nearby: snapshot of cl/313536507
...
Signed-off-by: Alexey Polyudov <apolyudov@google.com >
Change-Id: I8936b527079074d5c3af5531b9245063767cc4a7
2020-05-28 00:03:22 -07:00
Alexey Polyudov
c3a89bb894
Generate OSS-ready HEAD from master
...
Signed-off-by: Alexey Polyudov <apolyudov@google.com >
Change-Id: I8ca8ef4727e289f3c6ea62ad73008ad718096e5d
2020-05-04 13:14:50 -07:00
Alexey Polyudov
f3c7e9dd10
Prepare Project for open source
...
Change-Id: Ic26d4915efa2be47ce00ffaab7a474d696e6657c
2020-05-04 13:14:45 -07:00
Alexey Polyudov
271a449d7a
Prepare Project for open source
...
Change-Id: Ic26d4915efa2be47ce00ffaab7a474d696e6657c
2020-05-04 13:13:13 -07:00
Alexey Polyudov
5aaab9a4c0
Fix the build
...
Change-Id: Ied63786e8f73cec805123031c26886295f086691
Signed-off-by: Alexey Polyudov <apolyudov@google.com >
2020-04-06 10:20:15 -07:00
Alexey Polyudov
fef714be4e
Update build scripts
...
Change-Id: I52f7a35324c6be29d7e80d5cc0e6084b49bcc0eb
2020-04-06 10:19:13 -07:00
Alexey Polyudov
81a6d31778
Merge branch 'google3'
...
Change-Id: I8511d14d8173f661fc79cf0ad6ed3e8700efdbd4
2020-04-04 12:56:13 -07:00
Alexey Polyudov
18c09c5abe
Fix build and tests
...
Signed-off-by: Alexey Polyudov <apolyudov@google.com >
Change-Id: I3671e40fd0f8f028e3c8e46c4a47de0d2cc9aeff
2020-04-04 12:55:06 -07:00
Alexey Polyudov
7466db88c0
Add CMake support
...
Change-Id: I716e1fa3ec43bfe57326f5a691131505f84b7832
2020-04-04 12:55:01 -07:00
Alexey Polyudov
d455926d89
nearby: snapshot of cl/304428753
...
Signed-off-by: Alexey Polyudov <apolyudov@google.com >
Change-Id: I0023ac6e40456fc4a8169c3173bcbff3b5ccc476
2020-04-04 12:54:05 -07:00
Alexey Polyudov
204f76077d
nearby: snapshot as of cl/296436629
...
Signed-off-by: Alexey Polyudov <apolyudov@google.com >
Change-Id: I2cf5bf225b76f4c1541954651f3a7544a14e0cec
2020-04-04 12:52:31 -07:00
Alexey Polyudov